From 8ec226e8c778a3d1b4268edc33cd7c515d88ab31 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Sun, 16 Sep 2012 13:15:18 -0700
Subject: 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
---
 res/layout/permissions_list.xml | 47 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 res/layout/permissions_list.xml

(limited to 'res/layout/permissions_list.xml')

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>
-- 
cgit v1.2.3