summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-05-14 21:42:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 21:42:07 +0000
commitfb445cd97d828fa2d9fe3190b25524e39038cd0b (patch)
treeb58f33560f46eb71565ed32ca29293e8a5d07086 /res/layout
parentc2af7f9175d6ae1cb1ec599a6b9361f4434fa531 (diff)
parent7066003b2032a49ae5e59dab9b706259bdeb7e6e (diff)
downloadandroid_packages_apps_Trebuchet-fb445cd97d828fa2d9fe3190b25524e39038cd0b.tar.gz
android_packages_apps_Trebuchet-fb445cd97d828fa2d9fe3190b25524e39038cd0b.tar.bz2
android_packages_apps_Trebuchet-fb445cd97d828fa2d9fe3190b25524e39038cd0b.zip
Merge "Various lint error fixes." into ub-launcher3-burnaby
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/apps_list_view.xml2
-rw-r--r--res/layout/search_drop_target_bar.xml3
-rw-r--r--res/layout/widgets_list_row_view.xml1
3 files changed, 6 insertions, 0 deletions
diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml
index ef20323c1..5e50191ea 100644
--- a/res/layout/apps_list_view.xml
+++ b/res/layout/apps_list_view.xml
@@ -56,6 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
+ android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:paddingTop="13dp"
android:paddingBottom="13dp"
@@ -86,6 +87,7 @@
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="6dp"
+ android:layout_marginRight="6dp"
android:paddingTop="13dp"
android:paddingBottom="13dp"
android:contentDescription="@string/apps_view_search_bar_hint"
diff --git a/res/layout/search_drop_target_bar.xml b/res/layout/search_drop_target_bar.xml
index 69f42bb4c..b0435aa0e 100644
--- a/res/layout/search_drop_target_bar.xml
+++ b/res/layout/search_drop_target_bar.xml
@@ -36,6 +36,7 @@
<com.android.launcher3.DeleteDropTarget
android:id="@+id/delete_target_text"
style="@style/DropTargetButton"
+ android:drawableLeft="@drawable/remove_target_selector"
android:drawableStart="@drawable/remove_target_selector"
android:text="@string/delete_target_label" />
</FrameLayout>
@@ -49,6 +50,7 @@
<com.android.launcher3.InfoDropTarget
android:id="@+id/info_target_text"
style="@style/DropTargetButton"
+ android:drawableLeft="@drawable/info_target_selector"
android:drawableStart="@drawable/info_target_selector"
android:text="@string/info_target_label" />
</FrameLayout>
@@ -62,6 +64,7 @@
<com.android.launcher3.UninstallDropTarget
android:id="@+id/uninstall_target_text"
style="@style/DropTargetButton"
+ android:drawableLeft="@drawable/uninstall_target_selector"
android:drawableStart="@drawable/uninstall_target_selector"
android:text="@string/delete_target_uninstall_label" />
</FrameLayout>
diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml
index 2cbdb5cff..be62ee9fc 100644
--- a/res/layout/widgets_list_row_view.xml
+++ b/res/layout/widgets_list_row_view.xml
@@ -58,6 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/widget_row_padding"
+ android:layout_marginLeft="@dimen/widget_row_padding"
android:orientation="horizontal"
android:divider="@drawable/widgets_row_divider"
android:showDividers="middle"