summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-07-13 23:24:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-13 23:24:02 +0000
commitaf2637376f5fb37d1dfa598a8c95a623367501ce (patch)
treee7e5d657594778211ec8f241fb46c8009e1bc4ed /res
parentcbab1cb44f4fca4ea80ec2aeb63b55b9ea5d9e2e (diff)
parent4f3bfadbf472665ea8431cf2616d56a9445df466 (diff)
downloadandroid_packages_apps_Trebuchet-af2637376f5fb37d1dfa598a8c95a623367501ce.tar.gz
android_packages_apps_Trebuchet-af2637376f5fb37d1dfa598a8c95a623367501ce.tar.bz2
android_packages_apps_Trebuchet-af2637376f5fb37d1dfa598a8c95a623367501ce.zip
Merge "Fixing regression in calculating workspace padding." into ub-launcher3-burnaby
Diffstat (limited to 'res')
-rw-r--r--res/layout-sw720dp/launcher.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index d382c6a9f..802922ec1 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -18,7 +18,6 @@
<com.android.launcher3.LauncherRootView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res-auto"
-
android:id="@+id/launcher"
android:layout_width="match_parent"
android:layout_height="match_parent"