diff options
author | Bruno Martins <bgcngm@gmail.com> | 2020-01-18 19:04:13 +0000 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-20 18:54:58 +0200 |
commit | a4a4a9e4296bd8891d67f8bf4e362239772f9859 (patch) | |
tree | f40f1c24b8dc44beef302324ffe7063ff8e900eb | |
parent | d601fba4350ec4c9ca2755068afd8e97c9b86cc6 (diff) |
sdm660-common: doze: Fix dark theme issues
This brings SwitchBar widget inline with 10 and fixes the
theme issues when the dark mode is enabled.
Change-Id: I6909b77bc649eb9eb760bf01b46f66570363e9d9
-rw-r--r-- | doze/Android.mk | 2 | ||||
-rw-r--r-- | doze/res/color/switch_bar_bg.xml | 4 | ||||
-rw-r--r-- | doze/res/color/switchbar_switch_thumb_tint.xml | 20 | ||||
-rw-r--r-- | doze/res/color/switchbar_switch_track_tint.xml | 21 | ||||
-rw-r--r-- | doze/res/layout/switch_bar.xml | 5 | ||||
-rw-r--r-- | doze/res/values-night/colors.xml | 20 | ||||
-rw-r--r-- | doze/res/values/colors.xml | 21 | ||||
-rw-r--r-- | doze/res/values/styles.xml | 13 |
8 files changed, 60 insertions, 46 deletions
diff --git a/doze/Android.mk b/doze/Android.mk index e72c9b5..817df97 100644 --- a/doze/Android.mk +++ b/doze/Android.mk @@ -22,4 +22,6 @@ LOCAL_RESOURCE_DIR := \ LOCAL_PROGUARD_FLAG_FILES := proguard.flags +include frameworks/base/packages/SettingsLib/common.mk + include $(BUILD_PACKAGE) diff --git a/doze/res/color/switch_bar_bg.xml b/doze/res/color/switch_bar_bg.xml index ba2dae1..ca13e3c 100644 --- a/doze/res/color/switch_bar_bg.xml +++ b/doze/res/color/switch_bar_bg.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2019 The LineageOS Project +<!-- Copyright (C) 2019-2020 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. @@ -15,6 +15,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#ff80868B" android:state_activated="false" /> + <item android:color="@color/switchbar_background_color" android:state_activated="false" /> <item android:color="?android:attr/colorAccent" android:state_activated="true" /> </selector> diff --git a/doze/res/color/switchbar_switch_thumb_tint.xml b/doze/res/color/switchbar_switch_thumb_tint.xml deleted file mode 100644 index d4bf9b3..0000000 --- a/doze/res/color/switchbar_switch_thumb_tint.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2018 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. - --> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#FFFFFF" /> -</selector> diff --git a/doze/res/color/switchbar_switch_track_tint.xml b/doze/res/color/switchbar_switch_track_tint.xml deleted file mode 100644 index ae45c7a..0000000 --- a/doze/res/color/switchbar_switch_track_tint.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2018 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. - --> - -<selector - xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#BFFFFFFF" /> -</selector> diff --git a/doze/res/layout/switch_bar.xml b/doze/res/layout/switch_bar.xml index 9e11a0a..1bf6f6c 100644 --- a/doze/res/layout/switch_bar.xml +++ b/doze/res/layout/switch_bar.xml @@ -22,7 +22,8 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" - android:gravity="center"> + android:gravity="center" + android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent"> <TextView android:id="@+id/switch_text" android:layout_height="wrap_content" @@ -33,7 +34,7 @@ android:maxLines="2" android:ellipsize="end" android:textAppearance="@android:style/TextAppearance.Material.Title" - android:textColor="@android:color/white" + android:textColor="?android:attr/textColorPrimaryInverse" android:textSize="18sp" android:textAlignment="viewStart" /> diff --git a/doze/res/values-night/colors.xml b/doze/res/values-night/colors.xml new file mode 100644 index 0000000..5aa9c8e --- /dev/null +++ b/doze/res/values-night/colors.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. + 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="switchbar_switch_track_tint">#82000000</color> + <color name="switchbar_switch_thumb_tint">@android:color/black</color> +</resources> diff --git a/doze/res/values/colors.xml b/doze/res/values/colors.xml new file mode 100644 index 0000000..bb85f62 --- /dev/null +++ b/doze/res/values/colors.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. + 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="switchbar_background_color">@*android:color/material_grey_600</color> + <color name="switchbar_switch_track_tint">#BFFFFFFF</color> + <color name="switchbar_switch_thumb_tint">@android:color/white</color> +</resources> diff --git a/doze/res/values/styles.xml b/doze/res/values/styles.xml index 3443c0b..314665d 100644 --- a/doze/res/values/styles.xml +++ b/doze/res/values/styles.xml @@ -45,7 +45,10 @@ <item name="android:layout">@layout/preference_material_settings</item> </style> - <style name="Theme.Main.PreferenceTheme"> + <style name="Theme.Main.PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase"> + <item name="preferenceCategoryTitleTextAppearance"> + @style/Theme.Main.TextAppearance.CategoryTitle + </item> </style> <style name="Theme.Main.SwitchPreferenceStyle" parent="@style/Theme.Main.PreferenceStyle"> @@ -59,4 +62,12 @@ <item name="android:trackTint">@color/switchbar_switch_track_tint</item> <item name="android:thumbTint">@color/switchbar_switch_thumb_tint</item> </style> + + <style name="Theme.Main.TextAppearance.CategoryTitle" + parent="@*android:style/TextAppearance.DeviceDefault.Body2"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">11sp</item> + <!-- 0.8 Spacing, 0.8/11 = 0.072727273 --> + <item name="android:letterSpacing">0.072727273</item> + </style> </resources> |