summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml1
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/values/styles.xml8
-rw-r--r--res/values/themes.xml4
4 files changed, 17 insertions, 2 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0395989..f3fea10 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -67,7 +67,6 @@
<color name="fingerprint_progress_ring">?android:attr/colorAccent</color>
<color name="fingerprint_progress_ring_bg">#20000000</color>
<color name="fingerprint_indicator_background_resting">#12000000</color>
- <color name="fingerprint_indicator_background_activated">#80009688</color>
<color name="running_processes_system_ram">#ff384248</color>
<color name="running_processes_apps_ram">#ff009587</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 02d92ec..5c57f83 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6460,6 +6460,12 @@
<!-- Title of storage preference to control where app is stored -->
<string name="storage_used">Storage used</string>
+ <!-- Title of button to change storage [CHAR LIMIT=25] -->
+ <string name="change">Change</string>
+
+ <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+ <string name="change_storage">Change storage</string>
+
<!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
<string name="notifications_label">Notifications</string>
<!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0f820f0..387acf5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -327,12 +327,18 @@
<item name="android:textColor">@color/warning</item>
</style>
- <style name="SetupWizardFingerprintStyle">
+ <style name="FingerprintLayoutTheme">
<item name="suwBackground">@drawable/fp_enrollment_header</item>
<item name="suwIllustrationAspectRatio">@dimen/fingerprint_illustration_aspect_ratio</item>
<item name="suwDecorPaddingTop">@dimen/fingerprint_decor_padding_top</item>
</style>
+ <style name="SetupWizardFingerprintLayoutTheme">
+ <item name="suwBackgroundTile">@drawable/setup_illustration_tile</item>
+ <item name="suwIllustration">@drawable/setup_illustration_lock_screen</item>
+ <item name="suwIllustrationHorizontalTile">@drawable/setup_illustration_horizontal_tile</item>
+ </style>
+
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@color/warning</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e6621a8..e6229e0 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,6 +15,7 @@
-->
<resources>
+ <attr name="fingerprint_layout_theme" format="reference" />
<attr name="ic_menu_add" format="reference" />
<attr name="ic_menu_moreoverflow" format="reference" />
<attr name="ic_wps" format="reference" />
@@ -36,6 +37,7 @@
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+ <item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
@@ -58,6 +60,7 @@
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+ <item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
@@ -90,6 +93,7 @@
<item name="apnPreferenceStyle">@style/ApnPreference</item>
+ <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
<item name="ic_wps">@drawable/ic_wps_light</item>