diff options
author | Christoph Studer <chstuder@google.com> | 2014-09-17 15:03:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 15:03:17 +0000 |
commit | 2b7ec633cc316fbc0258fe8c2b6d46c1d4043ba4 (patch) | |
tree | 3da362047fddb672f84d85c30bdab63145208305 /packages/SystemUI/res | |
parent | 390b79c7c565882645ed66cf398f2b19a366076a (diff) | |
parent | fe12eaf06c94b7f31b8ae44f19671f943a54a5ce (diff) | |
download | frameworks_base-2b7ec633cc316fbc0258fe8c2b6d46c1d4043ba4.zip frameworks_base-2b7ec633cc316fbc0258fe8c2b6d46c1d4043ba4.tar.gz frameworks_base-2b7ec633cc316fbc0258fe8c2b6d46c1d4043ba4.tar.bz2 |
am 97e3cb89: am c93c4fd9: Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev
* commit '97e3cb89ad942d73f7e6b978915ea28818b671ff':
SysUI: Add no-wallpaper recents theme for low GFX devices
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/values/config.xml | 4 | ||||
-rw-r--r-- | packages/SystemUI/res/values/styles.xml | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index a8c95c1..9654da9 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -35,6 +35,10 @@ <!-- The number of app icons we keep in memory --> <integer name="config_recents_max_icon_count">20</integer> + + <!-- The theme to use for RecentsActivity. --> + <item type="style" name="config_recents_activity_theme">@style/RecentsTheme.Wallpaper</item> + <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices --> <bool name="config_hspa_data_distinguishable">false</bool> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 0456c82..46e7587 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -20,14 +20,9 @@ <item name="android:windowAnimationStyle">@style/Animation.RecentsActivity</item> </style> - <!-- Alternate Recents theme --> <style name="RecentsTheme" parent="@android:style/Theme"> <!-- NoTitle --> <item name="android:windowNoTitle">true</item> - <!-- Wallpaper --> - <item name="android:windowBackground">@color/transparent</item> - <item name="android:colorBackgroundCacheHint">@null</item> - <item name="android:windowShowWallpaper">true</item> <!-- Misc --> <item name="android:statusBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item> @@ -36,6 +31,20 @@ <item name="android:ambientShadowAlpha">0.35</item> </style> + + <!-- Alternate Recents theme --> + <style name="RecentsTheme.Wallpaper"> + <!-- Wallpaper --> + <item name="android:windowBackground">@color/transparent</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowShowWallpaper">true</item> + </style> + + <!-- Performance optimized alternate Recents theme (no wallpaper) --> + <style name="RecentsTheme.NoWallpaper"> + <item name="android:windowBackground">@android:color/black</item> + </style> + <!-- Animations for a non-full-screen window or activity. --> <style name="Animation.RecentsActivity" parent="@android:style/Animation.Activity"> <item name="android:activityOpenEnterAnimation">@anim/recents_launch_from_launcher_enter</item> |