resolve merge conflicts of c10abb25f3 to cw-e-dev.

Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518

3 files changed, 14 insertions, 58 deletions

diff --git a/res/values/colors.xml b/res/values/colors.xml
deleted file mode 100755
index 549f55fd..00000000
--- a/res/values/colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<resources>
-    <color name="shadow">#cc222222</color>
-    <color name="transparent">#00000000</color>
-    <color name="header_background_color">#ff37474f</color>
-    <color name="grant_permissions_app_color">@*android:color/primary_text_default_material_light</color>
-    <color name="grant_permissions_progress_color">#60000000</color>
-
-    <color name="lb_content_title_text_color">#FFF1F1F1</color>
-    <color name="lb_content_breadcrumb_text_color">#88F1F1F1</color>
-    <color name="lb_content_description_text_color">#88F1F1F1</color>
-    <color name="lb_action_fragment_background">#FF111111</color>
-    <color name="lb_dialog_activity_background">#77000000</color>
-
-</resources>
-
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9c166971..7f6a4693 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,37 +15,22 @@
 -->
 
 <resources>
-    <style name="padded">
-        <item name="android:paddingStart">16dip</item>
-        <item name="android:paddingEnd">16dip</item>
-    </style>
-    <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar"/>
-    <style name="Theme.AlertDialogActivity" parent="@android:style/Theme.DeviceDefault.Light.Panel">
-        <item name="android:backgroundDimEnabled">true</item>
-    </style>
-
-    <style name="Theme.Header.Settings" parent="@android:style/Theme.DeviceDefault.Settings">
-    </style>
 
-    <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 name="Theme.DialogWhenLarge"
+           parent="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar">
     </style>
 
-    <style name="Preference.Permissions">
-        <item name="layout">@layout/preference_permissions</item>
-    </style>
-
-    <style name="Preference.Category.Permissions">
-        <item name="layout">@layout/preference_category_material</item>
+    <style name="Theme.AlertDialogActivity"
+           parent="@android:style/Theme.DeviceDefault.Light.Panel">
+        <item name="android:backgroundDimEnabled">true</item>
     </style>
 
-    <style name="Preference.SwitchPreference.Permissions">
-        <item name="layout">@layout/preference_permissions_switch</item>
+    <style name="Theme.Header.Settings"
+           parent="@android:style/Theme.DeviceDefault.Settings">
     </style>
 
     <style name="ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
         <item name="android:contentInsetStart">72dp</item>
     </style>
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2f9c2b55..026c77fa 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,11 +16,13 @@
   -->
 
 <resources>
-    <style name="Settings" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="android:actionBarStyle">@style/ActionBar</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item>
+
+    <style name="Settings"
+           parent="@android:style/Theme.DeviceDefault.Settings">
     </style>
 
     <style name="GrantPermissions"
-            parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" />
+           parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">
+    </style>
+
 </resources>