diff options
| author | George Mount <mount@google.com> | 2014-06-12 20:06:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 20:06:03 +0000 |
| commit | 005fbda20568412693dc11a26ba3c5caab6b8877 (patch) | |
| tree | 38f32e5a9fa2842211ec38e39c4f1dc7702de0e3 | |
| parent | 1532feb580d17e47316a9b91ddef78f919fd087d (diff) | |
| parent | 168a212848828cbacdf21f32aa7a494e2423879b (diff) | |
| download | frameworks_base-005fbda20568412693dc11a26ba3c5caab6b8877.zip frameworks_base-005fbda20568412693dc11a26ba3c5caab6b8877.tar.gz frameworks_base-005fbda20568412693dc11a26ba3c5caab6b8877.tar.bz2 | |
am 127ae6e5: Merge "Add reasonable default activity transitions to theme.material.light." into lmp-preview-dev
* commit '127ae6e5584f8dcc8db4a4faa6bd03272f631f57':
Add reasonable default activity transitions to theme.material.light.
| -rw-r--r-- | core/res/res/values/themes_material.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index a42996a..97ad7e4 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -513,6 +513,9 @@ please see themes_device_defaults.xml. <item name="windowActionBarFullscreenDecorLayout">@layout/screen_toolbar</item> <item name="statusBarColor">?attr/colorPrimaryDark</item> <item name="navigationBarColor">@color/black</item> + <item name="windowEnterTransition">@transition/fade</item> + <item name="windowSharedElementEnterTransition">@transition/move</item> + <item name="windowSharedElementExitTransition">@transition/move</item> <!-- Dialog attributes --> <item name="dialogTheme">@style/Theme.Material.Light.Dialog</item> |