diff --git a/F-Droid/res/layout-v11/install_confirm.xml b/F-Droid/res/layout-v11/install_confirm.xml new file mode 100644 index 000000000..911e8d944 --- /dev/null +++ b/F-Droid/res/layout-v11/install_confirm.xml @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- + + Defines the layout of the splash screen that displays the security + settings required for an application and requests the confirmation of the + user before it is installed. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/install_confirm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/install_confirm" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="4dip" /> + + <ImageView + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:background="?android:attr/dividerHorizontal" + android:visibility="gone" /> + + <FrameLayout + android:id="@+id/filler" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:visibility="gone"> + </FrameLayout> + + <TabHost + android:id="@android:id/tabhost" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <HorizontalScrollView android:id="@+id/tabscontainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/tab_unselected_holo" + android:fillViewport="true" + android:scrollbars="none"> + <FrameLayout android:layout_width="match_parent" + android:layout_height="wrap_content"> + <TabWidget + android:id="@android:id/tabs" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </FrameLayout> + </HorizontalScrollView> + + <FrameLayout + android:id="@android:id/tabcontent" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="0"/> + + <android.support.v4.view.ViewPager + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"/> + + </LinearLayout> + </TabHost> + + <!-- OK confirm and cancel buttons. --> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:divider="?android:attr/dividerHorizontal" + android:showDividers="beginning"> + + <LinearLayout + style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:measureWithLargestChild="true"> + + <LinearLayout android:id="@+id/leftSpacer" + android:layout_weight="0.25" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:visibility="gone" /> + + <Button android:id="@+id/cancel_button" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="start" + android:layout_weight="1" + android:text="@string/cancel" + android:maxLines="2" + style="?android:attr/buttonBarButtonStyle" /> + + <Button android:id="@+id/ok_button" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_weight="1" + android:text="@string/next" + android:maxLines="2" + android:filterTouchesWhenObscured="true" + style="?android:attr/buttonBarButtonStyle" /> + + <LinearLayout android:id="@+id/rightSpacer" + android:layout_width="0dip" + android:layout_weight="0.25" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:visibility="gone" /> + + </LinearLayout> + </LinearLayout> +</LinearLayout> diff --git a/F-Droid/res/layout/install_confirm.xml b/F-Droid/res/layout/install_confirm.xml index 911e8d944..d20443a76 100644 --- a/F-Droid/res/layout/install_confirm.xml +++ b/F-Droid/res/layout/install_confirm.xml @@ -42,7 +42,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:background="?android:attr/dividerHorizontal" android:visibility="gone" /> <FrameLayout