Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into HEADcm-10.1-M1

Change-Id: Ib1b0bbed7b33842394ef77676885a4d1940b6fdb

1 files changed, 55 insertions, 30 deletions

diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index 0eb8ba6b..f9fb3591 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,66 @@
             android:text="@string/install_confirm_question"
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/padded"
-            android:paddingTop="12dip"
-            android:paddingBottom="16dip"/>
+            android:paddingTop="4dip" />
 
-    <ScrollView
+    <ImageView
+            android:id="@+id/divider"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fillViewport="true"
-            android:layout_weight="1">
+            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">
 
-        <!-- Security settings description. -->
         <LinearLayout
-                android:id="@+id/permissions_section"
+            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: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 +101,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"
@@ -106,7 +131,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:layout_weight="1"
-                    android:text="@string/install"
+                    android:text="@string/next"
                     android:maxLines="2"
                     android:filterTouchesWhenObscured="true"
                     style="?android:attr/buttonBarButtonStyle" />