diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-06-10 23:10:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 23:10:08 +0000 |
| commit | ed76e59e49657e6a49d140bfea8ddd764e5ba731 (patch) | |
| tree | 830fc17c16125de1d1b959846c8c5845a90d198a /res/values | |
| parent | 34450932b28565edfe3009dfdb2f92476c11671a (diff) | |
| parent | ff41a9a5a6e307ca6dcbc45361854b5ac4e59857 (diff) | |
| download | packages_apps_Settings-ed76e59e49657e6a49d140bfea8ddd764e5ba731.zip packages_apps_Settings-ed76e59e49657e6a49d140bfea8ddd764e5ba731.tar.gz packages_apps_Settings-ed76e59e49657e6a49d140bfea8ddd764e5ba731.tar.bz2 | |
Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/styles.xml | 5 | ||||
| -rw-r--r-- | res/values/themes.xml | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 5e9d870..1d58779 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -225,6 +225,11 @@ <item name="android:layout_height">wrap_content</item> </style> + <style name="ConfirmDeviceCredentialsAnimationStyle" parent="@*android:style/Animation.Material.Activity"> + <item name="android:activityOpenEnterAnimation">@anim/confirm_credential_open_enter</item> + <item name="android:activityOpenExitAnimation">@anim/confirm_credential_open_exit</item> + </style> + <style name="Transparent"> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowNoTitle">true</item> diff --git a/res/values/themes.xml b/res/values/themes.xml index c2285e2..08b8de3 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -199,7 +199,7 @@ <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_950</item> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> - <item name="preferenceBackgroundColor">@color/confirm_device_credential_dark_background</item> + <item name="android:windowBackground">@color/confirm_device_credential_dark_background</item> <item name="confirmDeviceCredentialsSideMargin">32dp</item> <item name="confirmDeviceCredentialsTopMargin">32dp</item> @@ -208,6 +208,8 @@ <item name="@*android:regularColor">@color/lock_pattern_view_regular_color_dark</item> <item name="@*android:successColor">@color/lock_pattern_view_regular_color_dark</item> <item name="@*android:errorColor">@color/lock_pattern_view_error_color</item> + + <item name="android:windowAnimationStyle">@style/ConfirmDeviceCredentialsAnimationStyle</item> </style> <style name="Theme.FingerprintEnroll" parent="@*android:style/Theme.Material.Settings.NoActionBar"> |