diff options
| author | Christoph Studer <chstuder@google.com> | 2014-09-17 14:17:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-17 14:17:33 +0000 |
| commit | 9077cbc30e6c71c8d103ae44b0c30b765e42f66b (patch) | |
| tree | 17b7667a021ce95ff7fd6ae8b49e0a4c6c755183 /packages | |
| parent | 16ebe98d9a0195b737497f4d704475a195aa3f5d (diff) | |
| parent | 37e4468be1b4389794113c0a9bb6e7ef9335e400 (diff) | |
| download | frameworks_base-9077cbc30e6c71c8d103ae44b0c30b765e42f66b.zip frameworks_base-9077cbc30e6c71c8d103ae44b0c30b765e42f66b.tar.gz frameworks_base-9077cbc30e6c71c8d103ae44b0c30b765e42f66b.tar.bz2 | |
Merge "SysUI: Add no-wallpaper recents theme for low GFX devices" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 19 |
3 files changed, 19 insertions, 6 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index b94a258..3c2a776 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -199,7 +199,7 @@ android:excludeFromRecents="true" android:stateNotNeeded="true" android:resumeWhilePausing="true" - android:theme="@style/RecentsTheme"> + android:theme="@style/config_recents_activity_theme"> <intent-filter> <action android:name="com.android.systemui.recents.TOGGLE_RECENTS" /> </intent-filter> 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> |