summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-09-12 17:33:49 -0700
committerDianne Hackborn <hackbod@google.com>2012-09-12 17:33:49 -0700
commit37df032e580ab6bed29eb40b72df1f49cefd2af1 (patch)
treeae3fa9a41b90a29467ad1fcbdae12244bf242c6a /res
parent8707cfaa0c8c111e7fe2ad81d0b8052d4550d4d4 (diff)
downloadandroid_packages_apps_PackageInstaller-37df032e580ab6bed29eb40b72df1f49cefd2af1.tar.gz
android_packages_apps_PackageInstaller-37df032e580ab6bed29eb40b72df1f49cefd2af1.tar.bz2
android_packages_apps_PackageInstaller-37df032e580ab6bed29eb40b72df1f49cefd2af1.zip
New permissions UI.
Diffstat (limited to 'res')
-rw-r--r--res/layout/install_confirm.xml71
1 files changed, 40 insertions, 31 deletions
diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index 0eb8ba6b..753a24b6 100644
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -25,9 +25,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="8dip"
- android:paddingRight="8dip">
+ android:layout_height="match_parent">
<TextView
android:id="@+id/install_confirm_question"
@@ -36,38 +34,50 @@
android:text="@string/install_confirm_question"
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/padded"
- android:paddingTop="12dip"
- android:paddingBottom="16dip"/>
+ android:paddingTop="12dip" />
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:fillViewport="true"
- android:layout_weight="1">
+ <TabHost
+ android:id="@android:id/tabhost"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
- <!-- Security settings description. -->
<LinearLayout
- android:id="@+id/permissions_section"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginRight="?android:attr/scrollbarSize"
- style="@style/padded"
- android:orientation="vertical">
- <TextView
- android:id="@+id/security_settings_desc"
- android:text="@string/security_settings_desc"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
- <LinearLayout
- android:id="@+id/security_settings_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1.0"
- android:orientation="vertical"/>
+ android:background="@*android: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>
- </ScrollView>
+ </TabHost>
<!-- OK confirm and cancel buttons. -->
<LinearLayout
@@ -75,8 +85,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
- android:showDividers="beginning"
- android:paddingTop="16dip">
+ android:showDividers="beginning">
<LinearLayout
style="?android:attr/buttonBarStyle"