PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Get rid of duplicate backgrounds" into jb-mr2-dev

Browse Source
This commit is contained in:
Michael Jurka
2013-05-08 10:15:49 +00:00
committed by Android (Google) Code Review
parent f6f93cfe6f 496fefb40d
commit d80dc80dbf
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout-port/launcher.xml
+1 -5
View File
@@ -25,11 +25,7 @@
android:background="@drawable/workspace_bg"> android:background="@drawable/workspace_bg">
<com.android.launcher2.DragLayer <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:id="@+id/drag_layer"
android:background="@drawable/workspace_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
@@ -116,4 +112,4 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="invisible" /> android:visibility="invisible" />
</com.android.launcher2.DragLayer> </com.android.launcher2.DragLayer>
</FrameLayout> </FrameLayout>
res/layout-sw720dp/launcher.xml
+1 -5
View File
@@ -25,11 +25,7 @@
android:background="@drawable/workspace_bg"> android:background="@drawable/workspace_bg">
<com.android.launcher2.DragLayer <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:id="@+id/drag_layer"
android:background="@drawable/workspace_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
@@ -117,4 +113,4 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="invisible" /> android:visibility="invisible" />
</com.android.launcher2.DragLayer> </com.android.launcher2.DragLayer>
</FrameLayout> </FrameLayout>
src/com/android/launcher2/Launcher.java
+1 -3
View File
@@ -288,7 +288,6 @@ public final class Launcher extends Activity
private static Drawable.ConstantState[] sAppMarketIcon = new Drawable.ConstantState[2]; private static Drawable.ConstantState[] sAppMarketIcon = new Drawable.ConstantState[2];
private Drawable mWorkspaceBackgroundDrawable; private Drawable mWorkspaceBackgroundDrawable;
private Drawable mBlackBackgroundDrawable;
private final ArrayList<Integer> mSynchronouslyBoundPages = new ArrayList<Integer>(); 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); mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
mWorkspaceBackgroundDrawable = getResources().getDrawable(R.drawable.workspace_bg); mWorkspaceBackgroundDrawable = getResources().getDrawable(R.drawable.workspace_bg);
mBlackBackgroundDrawable = new ColorDrawable(Color.BLACK);
// Setup the drag layer // Setup the drag layer
mDragLayer.setup(this, dragController); mDragLayer.setup(this, dragController);
@@ -2433,7 +2431,7 @@ public final class Launcher extends Activity
private void setWorkspaceBackground(boolean workspace) { private void setWorkspaceBackground(boolean workspace) {
mLauncherView.setBackground(workspace ? mLauncherView.setBackground(workspace ?
mWorkspaceBackgroundDrawable : mBlackBackgroundDrawable); mWorkspaceBackgroundDrawable : null);
} }
void updateWallpaperVisibility(boolean visible) { void updateWallpaperVisibility(boolean visible) {