Add files via upload

AndroidManifest.xml

@@ -1061,6 +1061,45 @@
                 android:resource="@string/qtifeedback_settings_subtitle" />
         </activity>
 
+        <!-- Buttons settings activity -->
+        <activity android:name="Settings$ButtonsSettingsActivity"
+                android:label="@string/buttons_pref_title"
+                android:icon="@drawable/ic_settings_buttons"
+                android:taskAffinity=""
+                android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.BUTTONS_SETTINGS" />
+                <action android:name="android.settings.BUTTONS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <intent-filter android:priority="7">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.device" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.ButtonsSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/buttons_pref_summary" />
+        </activity>
+
+        <!-- Keep compatibility with old shortcuts. -->
+        <activity-alias android:name="ButtonsSettings"
+                android:label="@string/buttons_pref_title"
+                android:exported="true"
+                android:targetActivity="Settings$ButtonsSettingsActivity">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.ButtonsSettings" />
+        </activity-alias>
+
         <activity android:name="Settings$NightDisplaySettingsActivity"
                 android:label="@string/night_display_title"
                 android:enabled="@*android:bool/config_nightDisplayAvailable"
@@ -2978,6 +3017,10 @@
                 android:label="@string/sim_settings_title"
                 android:icon="@drawable/ic_settings_sim"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />

res/drawable/dashboard_category_title_bg.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+   <solid android:color="@color/dashboard_category_title_background" />
+</shape>

res/drawable/dashboard_tile_bg.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+   <solid android:color="@color/selectable_card_background" />
+</shape>

res/drawable/ic_settings_buttons.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--This icon is the property of The Paranoid Android project. 
+
+All our assets including but not limited to images, are licensed under Creative Commons Attribution-NonCommercial 4.0 International, or CC BY-NC 4.0 for short. This means that you are allowed to modify the aforementioned assets in any way you want and you are free to share the originals and/or the modified work. However, you are not allowed to use the assets for commercial purposes and you must provide attribution at all times which means you have to include a short note about the license used (CC BY-NC 4.0), the original author/authors (Paranoid Android Project or AOSPA) and inform about any changes that have been made. A link to the website should usually be included as well.-->
+
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:name="Icon"
+        android:fillColor="#4285F4"
+        android:pathData="M12,5 C13.1045695,5 14,4.1045695 14,3 C14,1.8954305 13.1045695,1 12,1
+                C10.8954305,1 10,1.8954305 10,3 C10,4.1045695 10.8954305,5 12,5 Z M12,23
+                C13.1045695,23 14,22.1045695 14,21 C14,19.8954305 13.1045695,19 12,19
+                C10.8954305,19 10,19.8954305 10,21 C10,22.1045695 10.8954305,23 12,23 Z M12,11
+                C13.1045695,11 14,10.1045695 14,9 C14,7.8954305 13.1045695,7 12,7 C10.8954305,7
+                10,7.8954305 10,9 C10,10.1045695 10.8954305,11 12,11 Z M6,11 C7.1045695,11
+                8,10.1045695 8,9 C8,7.8954305 7.1045695,7 6,7 C4.8954305,7 4,7.8954305 4,9
+                C4,10.1045695 4.8954305,11 6,11 Z M6,17 C7.1045695,17 8,16.1045695 8,15
+                C8,13.8954305 7.1045695,13 6,13 C4.8954305,13 4,13.8954305 4,15 C4,16.1045695
+                4.8954305,17 6,17 Z M18,11 C19.1045695,11 20,10.1045695 20,9 C20,7.8954305
+                19.1045695,7 18,7 C16.8954305,7 16,7.8954305 16,9 C16,10.1045695 16.8954305,11
+                18,11 Z M12,17 C13.1045695,17 14,16.1045695 14,15 C14,13.8954305 13.1045695,13
+                12,13 C10.8954305,13 10,13.8954305 10,15 C10,16.1045695 10.8954305,17 12,17 Z" />
+</vector>

res/drawable/selectable_card.xml

@@ -18,5 +18,5 @@
 <ripple
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="@color/card_background"/>
-</ripple>
+    <item android:drawable="@drawable/dashboard_tile_bg"/>
+</ripple>

res/layout/condition_card.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2015 The Android Open Source Project
+     Copyright (C) 2016 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.
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="?android:attr/colorAccent"
+        android:background="@color/condition_card_background_color"
         android:elevation="2dp"
         android:clickable="true"
         android:focusable="true">
@@ -44,22 +44,22 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="32dp"
-                android:tint="?android:attr/textColorPrimaryInverse" />
+                android:tint="@color/condition_card_icon_color" />
 
             <TextView
                 android:id="@android:id/title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryInverse" />
+                android:textColor="@color/condition_card_title_text_color" />
 
             <ImageView
                 android:id="@+id/expand_indicator"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="16dp"
-                android:tint="?android:attr/textColorPrimaryInverse"/>
+                android:tint="@color/condition_card_expander_color" />
 
         </LinearLayout>
 
@@ -81,14 +81,14 @@
                 android:paddingBottom="16dp"
                 android:textAppearance="?android:attr/textAppearanceListItemSecondary"
                 android:alpha=".7"
-                android:textColor="?android:attr/textColorPrimaryInverse" />
+                android:textColor="@color/condition_card_summary_text_color" />
 
             <!-- TODO: Better background -->
             <View
                 android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height=".25dp"
-                android:background="@android:color/white" />
+                android:background="@color/condition_card_divider_color" />
 
             <com.android.internal.widget.ButtonBarLayout
                 android:id="@+id/buttonBar"
@@ -107,7 +107,7 @@
                     android:paddingStart="0dp"
                     android:alpha=".8"
                     android:textAlignment="viewStart"
-                    android:textColor="?android:attr/textColorPrimaryInverse"
+                    android:textColor="@color/condition_card_first_button_text_color"
                     style="?android:attr/buttonBarButtonStyle" />
 
                 <Button
@@ -117,7 +117,7 @@
                     android:layout_weight="1"
                     android:alpha=".8"
                     android:textAlignment="viewStart"
-                    android:textColor="?android:attr/textColorPrimaryInverse"
+                    android:textColor="@color/condition_card_second_button_text_color"
                     style="?android:attr/buttonBarButtonStyle" />
 
             </com.android.internal.widget.ButtonBarLayout>

res/layout/dashboard_category.xml

@@ -20,7 +20,7 @@
     android:layout_height="@dimen/dashboard_category_height"
     android:orientation="vertical"
     android:paddingBottom="8dip"
-    android:background="@color/card_background">
+    android:background="@drawable/dashboard_category_title_bg">
 
     <TextView android:id="@android:id/title"
         android:layout_width="match_parent"

res/layout/gesture_preference.xml

@@ -31,7 +31,7 @@
         android:paddingBottom="16dp"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:background="@android:color/white">
+        android:background="@color/gestures_switchbar_color">
 
         <TextView
             android:id="@android:id/title"

res/layout/storage_summary.xml

@@ -33,7 +33,7 @@
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textColor="?android:attr/colorAccent"
+        android:textColor="@color/storage_summary_title_color"
         android:textSize="36sp"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal" />

res/menu/manage_apps.xml

@@ -29,6 +29,14 @@
         android:id="@+id/hide_system"
         android:title="@string/menu_hide_system"
         android:showAsAction="never" />
+    <item
+        android:id="@+id/show_substratum"
+        android:title="@string/menu_show_substratum"
+        android:showAsAction="never" />
+    <item
+        android:id="@+id/hide_substratum"
+        android:title="@string/menu_hide_substratum"
+        android:showAsAction="never" />
     <item
         android:id="@+id/sort_order_alpha"
         android:title="@string/sort_order_alpha"