diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-05-08 15:04:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-08 15:04:06 -0700 |
| commit | 3e79edd2e659a7b9d521dc1c099a25411a136b6e (patch) | |
| tree | a1779e273678b4a299aaa9d8ba0bb8f79dd41c6c /src/com/android | |
| parent | 98e939fa01f870fb1c8a93510a09d2e8f2c4a5ef (diff) | |
| parent | aec5943f7996219482cf4fecfdf9485fd5953f91 (diff) | |
| download | android_packages_apps_Trebuchet-3e79edd2e659a7b9d521dc1c099a25411a136b6e.tar.gz android_packages_apps_Trebuchet-3e79edd2e659a7b9d521dc1c099a25411a136b6e.tar.bz2 android_packages_apps_Trebuchet-3e79edd2e659a7b9d521dc1c099a25411a136b6e.zip | |
am aec5943f: am d80dc80d: Merge "Get rid of duplicate backgrounds" into jb-mr2-dev
* commit 'aec5943f7996219482cf4fecfdf9485fd5953f91':
Get rid of duplicate backgrounds
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 0aab2acaf..7437eacff 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -288,7 +288,6 @@ public final class Launcher extends Activity private static Drawable.ConstantState[] sAppMarketIcon = new Drawable.ConstantState[2]; private Drawable mWorkspaceBackgroundDrawable; - private Drawable mBlackBackgroundDrawable; private final ArrayList<Integer> mSynchronouslyBoundPages = new ArrayList<Integer>(); @@ -959,7 +958,6 @@ public final class Launcher extends Activity mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); mWorkspaceBackgroundDrawable = getResources().getDrawable(R.drawable.workspace_bg); - mBlackBackgroundDrawable = new ColorDrawable(Color.BLACK); // Setup the drag layer mDragLayer.setup(this, dragController); @@ -2433,7 +2431,7 @@ public final class Launcher extends Activity private void setWorkspaceBackground(boolean workspace) { mLauncherView.setBackground(workspace ? - mWorkspaceBackgroundDrawable : mBlackBackgroundDrawable); + mWorkspaceBackgroundDrawable : null); } void updateWallpaperVisibility(boolean visible) { |