Merge "Add optional permission review for legacy apps - installer"

4 files changed, 124 insertions, 28 deletions

diff --git a/res/layout/review_permissions.xml b/res/layout/review_permissions.xml
new file mode 100644
index 00000000..462f9a54
--- /dev/null
+++ b/res/layout/review_permissions.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_marginTop="32dip"
+    android:layout_marginBottom="8dip"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="36dip"
+            android:layout_height="36dip"
+            android:tint="?android:attr/colorAccent"
+            android:scaleType="fitCenter">
+        </ImageView>
+
+        <TextView
+            android:id="@+id/permissions_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dip"
+            style="?android:attr/textAppearanceMedium">
+        </TextView>
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/preferences_frame"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
+        android:layout_weight="1">
+    </FrameLayout>
+
+    <com.android.internal.widget.ButtonBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="2dip"
+        android:paddingTop="16dip">
+
+        <Space
+            android:id="@*android:id/spacer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:visibility="invisible" />
+
+        <Button
+            android:id="@+id/cancel_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:text="@string/review_button_cancel" />
+
+        <Button
+            android:id="@+id/continue_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_marginStart="8dip"
+            android:text="@string/review_button_continue" />
+
+    </com.android.internal.widget.ButtonBarLayout>
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 494241f1..acc22bcb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -156,10 +156,6 @@
     <string name="grant_confirm_question">Do you want to grant the following permissions?
         It will get access to:</string>
 
-
-    <!-- Title for the dialog button to allow a permission grant. -->
-    <string name="grant_dialog_button_allow">Allow</string>
-
     <!-- Title for the dialog button to deny a permission grant. -->
     <string name="grant_dialog_button_deny">Deny</string>
 
@@ -265,4 +261,33 @@
     <!-- Title of dialog telling users that Install/Uninstall action is not supported on Android Wear. -->
     <string name="wear_not_allowed_dlg_text">Instal/Uninstall actions not supported on Wear.</string>
 
+    <!-- Review of runtime permissions for legacy apps -->
+
+    <!-- Template for the warning title when an updated app's requested permissions are reviewed. -->
+    <string name="permission_review_warning_title_template_update">
+        <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> has been updated.
+        Allow <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> to
+        access the following?</string>
+
+    <!-- Template for the screen title when app permissions are reviewed on install. -->
+    <string name="permission_review_title_template_install">Choose what to allow
+        <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> to access</string>
+
+    <!-- Template for the screen title when app permissions are reviewed on update. -->
+    <string name="permission_review_title_template_update">
+        <xliff:g id="app_name" example="Gmail">%1$s</xliff:g> has been updated.
+        Choose what to allow this app to access.</string>
+
+    <!-- Title for the dialog button to cancel the detailed permission review. -->
+    <string name="review_button_cancel">Cancel</string>
+
+    <!-- Title for the dialog button to continue accepting the detailed permission review. -->
+    <string name="review_button_continue">Continue</string>
+
+    <!-- Title for the category listing the new permissions used by an app. -->
+    <string name="new_permissions_category">New permissions</string>
+
+    <!-- Title for the category listing the current permissions used by an app. -->
+    <string name="current_permissions_category">Current permissions</string>
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 026c77fa..6f325d2b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -21,6 +21,11 @@
            parent="@android:style/Theme.DeviceDefault.Settings">
     </style>
 
+    <style name="Settings.NoActionBar" parent="@style/Settings">
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
     <style name="GrantPermissions"
            parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
     </style>
diff --git a/res/xml/all_permissions.xml b/res/xml/all_permissions.xml
deleted file mode 100644
index 06e929fe..00000000
--- a/res/xml/all_permissions.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/all_permissions">
-
-    <PreferenceCategory
-        android:key="other_perms"
-        android:title="@string/other_permissions" />
-
-</PreferenceScreen>