commit 496fefb40d403101d0bf1d35ab77a4ae2e85843c
author Michael Jurka <mikejurka@google.com> Mon May 06 15:39:11 2013 +0200
committer Michael Jurka <mikejurka@google.com> Mon May 06 16:38:38 2013 +0200
tree 72a109f34990f4195a1753e0041d385ca8bf10a8
parent 5c68e5f0c70c92a820372b4193f91880b8906570

Get rid of duplicate backgrounds

Bug: 8809491

res/layout-port/launcher.xml

diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 4b45807..346d29b 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -25,11 +25,7 @@
     android:background="@drawable/workspace_bg">
 
     <com.android.launcher2.DragLayer
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
         android:id="@+id/drag_layer"
-        android:background="@drawable/workspace_bg"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true">
@@ -116,4 +112,4 @@
             android:layout_height="match_parent"
             android:visibility="invisible" />
     </com.android.launcher2.DragLayer>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>

res/layout-sw720dp/launcher.xml

diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 1fc5322..2bacf36 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -25,11 +25,7 @@
     android:background="@drawable/workspace_bg">
 
     <com.android.launcher2.DragLayer
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
         android:id="@+id/drag_layer"
-        android:background="@drawable/workspace_bg"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true">
@@ -117,4 +113,4 @@
             android:layout_height="match_parent"
             android:visibility="invisible" />
     </com.android.launcher2.DragLayer>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 0aab2ac..7437eac 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -288,7 +288,6 @@
     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 @@
 
         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 @@
 
     private void setWorkspaceBackground(boolean workspace) {
         mLauncherView.setBackground(workspace ?
-                mWorkspaceBackgroundDrawable : mBlackBackgroundDrawable);
+                mWorkspaceBackgroundDrawable : null);
     }
 
     void updateWallpaperVisibility(boolean visible) {