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

Pattern view - Use new theme colors

Browse Source 
For both SUW and general settings use, colors should match what is
already is use for the systemui bouncer.

Bug: 195272825
Test: SUW pattern view && settings pattern view
Change-Id: I374c904e65aac9a29b5ff5635c9db39f4f7ca8d5
This commit is contained in:
Matt Pietal
2021-10-14 09:23:54 -04:00
parent c4f761c079
commit c4aa3b4ac5
4 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/colors.xml
View File

@@ -24,21 +24,10 @@
<color name="divider_color">#20ffffff</color>
<color name="title_color">@android:color/holo_blue_light</color>
<color name="setup_lock_pattern_view_regular_color_light">
@color/lock_pattern_view_regular_color
</color>
<color name="setup_lock_pattern_view_success_color_dark">#ff84ffff</color>
<color name="setup_lock_pattern_view_success_color_light">@color/sud_color_accent_light</color>
<color name="setup_lock_pattern_view_error_color_dark">#fff44336</color>
<color name="setup_wizard_wifi_color_dark">#89ffffff</color>
<color name="setup_wizard_wifi_color_light">#89000000</color>
<color name="lock_pattern_background">#00000000</color>
<color name="lock_pattern_view_regular_color">#ff37474f</color>
<color name="lock_pattern_view_regular_color_dark">#ffffff</color>
<color name="unlock_pattern_view_regular_color">@android:color/white</color>
<color name="fingerprint_title_area_bg">?android:attr/colorAccent</color>
<color name="fingerprint_title_color">#ffffffff</color>

24
res/values/styles.xml
View File

@@ -454,28 +454,10 @@
</style>
<style name="LockPatternStyle">
<item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
<item name="*android:successColor">@color/lock_pattern_view_success_color</item>
<item name="*android:regularColor">?android:attr/colorAccent</item>
<item name="*android:successColor">?android:attr/textColorPrimary</item>
<item name="*android:errorColor">?android:attr/colorError</item>
</style>
<style name="LockPatternStyle.Dark">
<item name="*android:regularColor">@color/lock_pattern_view_regular_color_dark</item>
<item name="*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
</style>
<style name="LockPatternStyle.Dark.Work">
<item name="*android:regularColor">@*android:color/white</item>
</style>
<style name="LockPatternStyle.Unlock">
<item name="*android:regularColor">@color/unlock_pattern_view_regular_color</item>
<item name="*android:successColor">@color/unlock_pattern_view_success_color</item>
</style>
<style name="LockPatternStyle.Setup">
<item name="*android:regularColor">@color/setup_lock_pattern_view_regular_color_light</item>
<item name="*android:successColor">@color/setup_lock_pattern_view_success_color_light</item>
<item name="*android:dotColor">?android:attr/textColorSecondary</item>
</style>
<style name="device_info_dialog_label">

8
res/values/themes.xml
View File

@@ -58,7 +58,7 @@
<!-- For AndroidX AlertDialog -->
<item name="alertDialogTheme">@style/Theme.AlertDialog</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
<!-- For AppBarLayout -->
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
@@ -123,7 +123,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:background">@android:color/black</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Unlock</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
@@ -164,13 +164,13 @@
<item name="confirmDeviceCredentialsSideMargin">32dp</item>
<item name="confirmDeviceCredentialsTopMargin">32dp</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
<item name="android:windowAnimationStyle">@style/ConfirmDeviceCredentialsAnimationStyle</item>
</style>
<style name="Theme.ConfirmDeviceCredentialsWork" parent="Theme.ConfirmDeviceCredentialsDark">
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark.Work</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
<item name="android:colorAccent">@*android:color/white</item>
</style>

12
res/values/themes_suw.xml
View File

@@ -33,7 +33,7 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="GlifTheme.Light" parent="SudThemeGlif.Light">
@@ -51,7 +51,7 @@
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="GlifV2Theme" parent="SudThemeGlifV2.DayNight">
@@ -70,7 +70,7 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="GlifV2Theme.Light" parent="SudThemeGlifV2.Light">
@@ -88,7 +88,7 @@
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="GlifV3Theme" parent="SudThemeGlifV3.DayNight">
@@ -107,7 +107,7 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<!-- LockPatternView colors -->
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="GlifV3Theme.Footer" parent="@style/SudThemeGlifV3.DayNight">
@@ -130,7 +130,7 @@
<item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="GlifV3Theme.Light.NoActionBar" parent="GlifV3Theme.Light">