Merge "Add all permissions screen" into mnc-dev

4 files changed, 69 insertions, 0 deletions

diff --git a/res/layout/preference_category_material.xml b/res/layout/preference_category_material.xml
new file mode 100644
index 00000000..c60fd12b
--- /dev/null
+++ b/res/layout/preference_category_material.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+<!-- Based on frameworks/base/core/res/res/layout/preference_category_material.xml
+     but has a ViewGroup at the root to make the support lib happy.-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+android:id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dip"
+        android:textAppearance="@android:style/TextAppearance.Material.Body2"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:textColor="?android:attr/colorAccent"
+        android:paddingTop="16dip" />
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5185d6e0..5916efb6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -259,4 +259,9 @@
    <!-- Text displayed until loading is done -->
    <string name="loading">Loading\u2026</string>
 
+   <!-- [CHAR LIMIT=45] Title of all permissions settings -->
+   <string name="all_permissions">All permissions</string>
+   <!-- [CHAR LIMIT=45] Group of permissions granted to app automatically when installed. -->
+   <string name="other_permissions">Other app capabilities</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e800b56f..6d772910 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,7 @@
 
     <style name="PreferenceThemeOverlay.v14.Permissions">
         <item name="preferenceStyle">@style/Preference.Permissions</item>
+        <item name="preferenceCategoryStyle">@style/Preference.Category.Permissions</item>
         <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item>
     </style>
 
@@ -36,6 +37,10 @@
         <item name="layout">@layout/preference_permissions</item>
     </style>
 
+    <style name="Preference.Category.Permissions">
+        <item name="layout">@layout/preference_category_material</item>
+    </style>
+
     <style name="Preference.SwitchPreference.Permissions">
         <item name="layout">@layout/preference_permissions_switch</item>
     </style>
diff --git a/res/xml/all_permissions.xml b/res/xml/all_permissions.xml
new file mode 100644
index 00000000..06e929fe
--- /dev/null
+++ b/res/xml/all_permissions.xml
@@ -0,0 +1,24 @@
+<?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>