diff options
| author | Maurice Lam <yukl@google.com> | 2015-08-11 22:35:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-11 22:35:53 +0000 |
| commit | 3d9cb9261849d8178ce834c8216fe2154db4e5af (patch) | |
| tree | e2377ba12f6752e066a76256648d68ac45ec06f5 /res/values | |
| parent | be4df036e1c688a1b7a5fc9d4ab18f09729296b3 (diff) | |
| parent | d62aabf10d2c4174f8dee97836700d4e0e01e282 (diff) | |
| download | packages_apps_Settings-3d9cb9261849d8178ce834c8216fe2154db4e5af.zip packages_apps_Settings-3d9cb9261849d8178ce834c8216fe2154db4e5af.tar.gz packages_apps_Settings-3d9cb9261849d8178ce834c8216fe2154db4e5af.tar.bz2 | |
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
Diffstat (limited to 'res/values')
| -rwxr-xr-x | res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | res/values/themes.xml | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index dc0affb..2d860d7 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -222,7 +222,7 @@ <dimen name="redaction_vertical_margins">8dp</dimen> <!-- Fingerprint --> - <dimen name="fingerprint_ring_radius">80dip</dimen> + <dimen name="fingerprint_ring_radius">92dip</dimen> <dimen name="fingerprint_ring_thickness">4dip</dimen> <dimen name="fingerprint_dot_radius">8dp</dimen> <dimen name="fingerprint_pulse_radius">50dp</dimen> @@ -234,10 +234,13 @@ <dimen name="fingerprint_error_text_appear_distance">16dp</dimen> <dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen> <dimen name="fingerprint_animation_size">88dp</dimen> - <dimen name="fingerprint_progress_bar_size">168dp</dimen> + <dimen name="fingerprint_progress_bar_size">192dp</dimen> <dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen> <dimen name="fingerprint_in_app_indicator_size">120dp</dimen> + <dimen name="setup_fingerprint_ring_radius">80dip</dimen> + <dimen name="setup_fingerprint_progress_bar_size">168dp</dimen> + <dimen name="confirm_credentials_security_method_margin">48dp</dimen> <dimen name="fab_size">56dp</dimen> <dimen name="fab_margin">16dp</dimen> diff --git a/res/values/themes.xml b/res/values/themes.xml index e6229e0..b1bf390 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,6 +16,8 @@ <resources> <attr name="fingerprint_layout_theme" format="reference" /> + <attr name="fingerprint_progress_bar_size" format="reference|dimension" /> + <attr name="fingerprint_ring_radius" format="reference|dimension" /> <attr name="ic_menu_add" format="reference" /> <attr name="ic_menu_moreoverflow" format="reference" /> <attr name="ic_wps" format="reference" /> @@ -38,6 +40,8 @@ <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="fingerprint_progress_bar_size">@dimen/setup_fingerprint_progress_bar_size</item> + <item name="fingerprint_ring_radius">@dimen/setup_fingerprint_ring_radius</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> @@ -61,6 +65,8 @@ <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="fingerprint_progress_bar_size">@dimen/setup_fingerprint_progress_bar_size</item> + <item name="fingerprint_ring_radius">@dimen/setup_fingerprint_ring_radius</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> @@ -94,6 +100,8 @@ <item name="apnPreferenceStyle">@style/ApnPreference</item> <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item> + <item name="fingerprint_progress_bar_size">@dimen/fingerprint_progress_bar_size</item> + <item name="fingerprint_ring_radius">@dimen/fingerprint_ring_radius</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> |