PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Settings icons needed for theme overlaying." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 16:38:08 +00:00
committed by Android (Google) Code Review
parent 208c21d2c1 7b7d6888a2
commit 41f0a69b76
14 changed files with 79 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/attrs.xml
View File

@@ -166,10 +166,6 @@
<attr name="twoStateButtonPreferenceStyle" format="reference" />
<attr name="batteryGoodColor" format="color" />
<attr name="batteryBadColor" format="color" />
<attr name="batteryMaybeColor" format="color" />
<attr name="fingerprint_layout_theme" format="reference" />
<attr name="face_layout_theme" format="reference" />
<attr name="ic_menu_moreoverflow" format="reference" />

10
res/values/themes.xml
View File

@@ -28,6 +28,7 @@
<style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="preferenceTheme">@style/PreferenceTheme</item>
<item name="android:listPreferredItemHeight">72dip</item>
<item name="homeAsUpIndicator">@drawable/ic_arrow_back</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -53,11 +54,6 @@
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<!-- For battery status icons in -->
<item name="batteryGoodColor">@color/battery_good_color_light</item>
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
<item name="batteryBadColor">@color/battery_bad_color_light</item>
<!-- For AppBarLayout -->
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorPrimaryVariant">@android:color/white</item>
@@ -192,10 +188,6 @@
<!-- action bar, needed for search bar icon tinting -->
<item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar</item>
<!-- For battery status icons in -->
<item name="batteryGoodColor">@color/battery_good_color_light</item>
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
<item name="batteryBadColor">@color/battery_bad_color_light</item>
<!-- Define this color for material design -->
<item name="colorPrimaryVariant">@android:color/white</item>
</style>