Further adjustment of the new package installer UI.

- Privacy and Device permissions are not shown as separate tabs,
  but instead separate sections in the same single scrollable
  permissions list.
- No tabs are shown when installing a new app (they are all in
  the new single list); two tabs are shown when installing an
  update: the new permissions, and all permissions.
- If you are reviewing more permissions than fit on the screen,
  the "install" button is changed to a "next" button until you
  scroll through the entire list.

Change-Id: I0665a797f80ba5276e782e94be97090a429e5280

3 files changed, 60 insertions, 2 deletions

diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml
index 753a24b6..ed7f33b5 100644
--- a/res/layout/install_confirm.xml
+++ b/res/layout/install_confirm.xml
@@ -47,7 +47,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <HorizontalScrollView
+            <HorizontalScrollView android:id="@+id/tabscontainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@*android:drawable/tab_unselected_holo"
@@ -115,7 +115,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" />
diff --git a/res/layout/permissions_list.xml b/res/layout/permissions_list.xml
new file mode 100644
index 00000000..55eb81dd
--- /dev/null
+++ b/res/layout/permissions_list.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<!--
+This is the structure for the list of all permissions.
+-->
+<com.android.packageinstaller.CaffeinatedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollview"
+    android:fillViewport="true">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout android:id="@+id/privacylist"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
+                android:text="@string/privacyPerms" />
+        </LinearLayout>
+        <LinearLayout android:id="@+id/devicelist"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginTop="8dip"
+                android:text="@string/devicePerms" />
+        </LinearLayout>
+    </LinearLayout>
+</com.android.packageinstaller.CaffeinatedScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 22245a4f..d5d1ab52 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -16,6 +16,7 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Package installer</string>
+    <string name="next">Next</string>
     <string name="install">Install</string>
     <string name="done">Done</string>
     <!-- TODO REMOVE LATER -->
@@ -38,6 +39,14 @@
     <string name="install_confirm_question_update_system">Do you want to install an update
             to this built-in application?  Your existing data will not
             be lost.  The updated application will get access to:</string>
+    <!-- Message for updating an existing app, no permissions [CHAR LIMIT=NONE] -->
+    <string name="install_confirm_question_update_no_perms">Do you want to install an update
+            to this existing application?  Your existing data will not
+            be lost.  It does not require any special access.</string>
+    <!-- Message for updating an existing system app, no permissions [CHAR LIMIT=NONE] -->
+    <string name="install_confirm_question_update_system_no_perms">Do you want to install an update
+            to this built-in application?  Your existing data will not
+            be lost.  It does not require any special access.</string>
     <string name="install_failed">App not installed.</string>
     <!-- Reason displayed when installation fails because the installation package itself is invalid
         in some way (e.g., corrupt) [CHAR LIMIT=100] -->
@@ -122,6 +131,8 @@
 
     <!-- Tab label for new permissions being added to an existing app [CHAR LIMIT=20] -->
     <string name="newPerms">New</string>
+    <!-- Tab label for all permissions of an app being installed [CHAR LIMIT=20] -->
+    <string name="allPerms">All</string>
     <!-- Tab label for permissions related to user privacy [CHAR LIMIT=20] -->
     <string name="privacyPerms">Privacy</string>
     <!-- Tab label for permissions related to device behavior [CHAR LIMIT=20] -->