diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 1 | ||||
-rw-r--r-- | res/layout-land/migration_cling.xml | 1 | ||||
-rw-r--r-- | res/layout-port/migration_cling.xml | 1 | ||||
-rw-r--r-- | res/layout/apps_list_view.xml | 2 | ||||
-rw-r--r-- | res/layout/search_drop_target_bar.xml | 3 | ||||
-rw-r--r-- | res/layout/widgets_list_row_view.xml | 1 | ||||
-rw-r--r-- | res/values-land/styles.xml | 2 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
9 files changed, 12 insertions, 5 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index d5dd91ab4..f0f7bbb9f 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/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" diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml index db93da87a..269c1aee6 100644 --- a/res/layout-land/migration_cling.xml +++ b/res/layout-land/migration_cling.xml @@ -46,6 +46,7 @@ android:layout_width="@dimen/cling_migration_content_width" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/cling_migration_content_margin" + android:layout_marginRight="@dimen/cling_migration_content_margin" android:orientation="vertical" android:paddingLeft="24dp" android:paddingRight="24dp" > diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml index 81689d38b..3f696a216 100644 --- a/res/layout-port/migration_cling.xml +++ b/res/layout-port/migration_cling.xml @@ -48,6 +48,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/ic_cling_migration" android:layout_marginStart="@dimen/cling_migration_content_margin" + android:layout_marginLeft="@dimen/cling_migration_content_margin" android:orientation="vertical" android:paddingLeft="24dp" android:paddingRight="24dp" > 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" diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 8a255c91b..c5a76d595 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -28,7 +28,7 @@ </style> <!-- This style applies to the drop target when it is shown in the sidebar --> - <style name="DropTargetButton" parent="DropTargetButton.Base"> + <style name="DropTargetButton" parent="DropTargetButtonBase"> <item name="android:layout_height">wrap_content</item> <item name="android:gravity">center</item> <item name="android:drawablePadding">0dp</item> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index cbc1e29b3..e8b706e23 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -27,7 +27,7 @@ <item name="android:layout_height">match_parent</item> </style> - <style name="DropTargetButton" parent="DropTargetButton.Base"> + <style name="DropTargetButton" parent="DropTargetButtonBase"> <item name="android:paddingLeft">60dp</item> <item name="android:paddingRight">60dp</item> <item name="android:shadowColor">#393939</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index 78cc0837f..f95debeab 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -54,7 +54,7 @@ <item name="android:layout_height">match_parent</item> </style> - <style name="DropTargetButton.Base"> + <style name="DropTargetButtonBase"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> @@ -72,7 +72,7 @@ <item name="android:shadowRadius">4.0</item> </style> - <style name="DropTargetButton" parent="DropTargetButton.Base"></style> + <style name="DropTargetButton" parent="DropTargetButtonBase" /> <style name="PreloadIcon"> <item name="background">@drawable/virtual_preload</item> |