aboutsummaryrefslogtreecommitdiff
path: root/doze/res
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2017-03-30 22:45:48 +0100
committerDavide Garberi <dade.garberi@gmail.com>2017-12-04 09:01:04 +0100
commit83358debe4826aabca5e535e1635b6b2086d7e64 (patch)
tree2f3b3e73477f774ab43565be155dd36fb46127df /doze/res
parented1f601ff074e80c50fc64df939a921fa649bf16 (diff)
msm8996-common: Doze: Refactor
* Fix Ambient Display's switchbar on/off text. * Get rid of unnecessary receiver and all its related code, permissions and meta-data. * Keep the service running only if Doze is enabled system-wide along with at least one of the additional Ambient Display features. Change-Id: Id1f7f5e099f289a20f5757b7869e297e0ce74f7a Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'doze/res')
-rw-r--r--doze/res/layout/switch_bar.xml3
-rw-r--r--doze/res/values/styles.xml14
2 files changed, 6 insertions, 11 deletions
diff --git a/doze/res/layout/switch_bar.xml b/doze/res/layout/switch_bar.xml
index f98de96..d25948b 100644
--- a/doze/res/layout/switch_bar.xml
+++ b/doze/res/layout/switch_bar.xml
@@ -34,8 +34,7 @@
android:ellipsize="end"
android:textAppearance="@android:style/TextAppearance.Material.Title"
android:textColor="?android:attr/textColorPrimaryInverse"
- android:textAlignment="viewStart"
- android:text="@string/switch_bar_on" />
+ android:textAlignment="viewStart" />
<Switch
android:id="@android:id/switch_widget"
diff --git a/doze/res/values/styles.xml b/doze/res/values/styles.xml
index 78d2d59..f64a2b8 100644
--- a/doze/res/values/styles.xml
+++ b/doze/res/values/styles.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The CyanogenMod Project
+<!--
+ Copyright (C) 2015-2016 The CyanogenMod Project
+ 2017 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,13 +16,8 @@
limitations under the License.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="DozeSettings" parent="@android:style/Theme.Material.Settings">
- <item name="android:windowActionBar">false</item>
- <item name="preferenceTheme">@style/DozePreferenceTheme</item>
- </style>
-
- <style name="DozePreferenceTheme" parent="@android:style/Theme.Material.Settings">
- <item name="dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
+ <style name="Theme.Main" parent="@android:style/Theme.Material.Settings">
+ <item name="preferenceTheme">@android:style/Theme.Material.Settings</item>
</style>
<style name="ThemeOverlay.SwitchBar" parent="@android:style/ThemeOverlay">
@@ -30,5 +27,4 @@
<style name="ThemeOverlay.SwitchBar.Secondary" parent="@android:style/ThemeOverlay">
<item name="android:colorAccent">@color/system_secondary_color</item>
</style>
-
</resources>