diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-05-08 10:15:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-08 10:15:50 +0000 |
| commit | d80dc80dbf15f0329a085b21e6e6e4c993e68505 (patch) | |
| tree | cba334022ef5292c715597cdbdfb6059a5cf2548 /res | |
| parent | f6f93cfe6f3a18ce4de48af54fd1f3937a27bab7 (diff) | |
| parent | 496fefb40d403101d0bf1d35ab77a4ae2e85843c (diff) | |
| download | android_packages_apps_Trebuchet-d80dc80dbf15f0329a085b21e6e6e4c993e68505.tar.gz android_packages_apps_Trebuchet-d80dc80dbf15f0329a085b21e6e6e4c993e68505.tar.bz2 android_packages_apps_Trebuchet-d80dc80dbf15f0329a085b21e6e6e4c993e68505.zip | |
Merge "Get rid of duplicate backgrounds" into jb-mr2-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/launcher.xml | 6 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 4b4580710..346d29b5a 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> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 1fc53222f..2bacf362d 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> |