diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-02 20:33:02 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-02 20:33:02 -0700 |
| commit | 9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532 (patch) | |
| tree | 06c674c266a1699da404537c30a87e785963496f /src/com/android/launcher3/Launcher.java | |
| parent | c780ac1d535c3233b1d69471030759ed4f5e5a32 (diff) | |
| parent | 93716e36397322fa24cbd3498c521732702d8836 (diff) | |
| download | android_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.tar.gz android_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.tar.bz2 android_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 01e3fc584..2223a5c1e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -622,7 +622,7 @@ public class Launcher extends Activity CustomContentMode.DISABLED.getValue())); } - void initializeDynamicGrid() { + private void initializeDynamicGrid() { LauncherAppState.setApplicationContext(getApplicationContext()); LauncherAppState app = LauncherAppState.getInstance(); @@ -2754,6 +2754,8 @@ public class Launcher extends Activity if (mAppsCustomizeContent.getContentType() == AppsCustomizePagedView.ContentType.Applications) { showWorkspace(true); + // Background was set to gradient in onPause(), restore to black if in all apps. + setWorkspaceBackground(mState == State.WORKSPACE); } else { showOverviewMode(true); } |