Moved paddingStart to -v17 folder.
This is to help get us paddingStart free to be able to work on Samsung
tablets, as they crash on paddingStart when it is used outside of -v17.
Bug: 8166178
Change-Id: I84879257c4e463879fd6bfc322514d30c469ca30
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 1c96ca3..e993f78 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -22,7 +22,7 @@
android:background="@drawable/search_frame">
<!-- Global search icon -->
<com.android.launcher3.HolographicLinearLayout
- style="@style/SearchButton"
+ style="@style/SearchButton.WithPaddingStart"
launcher:sourceImageViewId="@+id/search_button"
android:id="@+id/search_button_container"
android:layout_width="match_parent"
@@ -31,7 +31,6 @@
android:layout_centerVertical="true"
android:layout_alignParentStart="true"
android:layout_toStartOf="@+id/voice_button_container"
- android:paddingStart="8dp"
android:onClick="onClickSearchButton"
android:focusable="true"
android:clickable="true"
@@ -57,6 +56,7 @@
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:paddingEnd="8dp"
+ android:paddingRight="8dp"
android:onClick="onClickVoiceButton"
android:focusable="true"
android:clickable="true"
diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml
index 69dd61a..3276f3f 100644
--- a/res/layout-sw720dp/search_bar.xml
+++ b/res/layout-sw720dp/search_bar.xml
@@ -20,7 +20,7 @@
android:background="@drawable/search_frame">
<!-- Global search icon -->
<com.android.launcher3.HolographicLinearLayout
- style="@style/SearchButton"
+ style="@style/SearchButton.WithPaddingStart"
launcher:sourceImageViewId="@+id/search_button"
android:id="@+id/search_button_container"
android:layout_width="match_parent"
@@ -29,7 +29,6 @@
android:layout_centerVertical="true"
android:layout_alignParentStart="true"
android:layout_toStartOf="@+id/voice_button_container"
- android:paddingStart="8dp"
android:onClick="onClickSearchButton"
android:focusable="true"
android:clickable="true"
@@ -55,6 +54,7 @@
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:paddingEnd="8dp"
+ android:paddingRight="8dp"
android:onClick="onClickVoiceButton"
android:focusable="true"
android:clickable="true"
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index f2d2342..7c98b4a 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -28,12 +28,13 @@
<!-- The preview of the widget or shortcut. -->
<com.android.launcher3.PagedViewWidgetImageView
android:id="@+id/widget_preview"
+ style="@style/PagedViewWidgetImageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="@dimen/app_widget_preview_padding_top"
- android:paddingStart="@dimen/app_widget_preview_padding_left"
android:paddingEnd="@dimen/app_widget_preview_padding_right"
+ android:paddingRight="@dimen/app_widget_preview_padding_right"
android:scaleType="matrix"
android:background="@drawable/screenpanel" />
<LinearLayout
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
new file mode 100644
index 0000000..71c4bfa
--- /dev/null
+++ b/res/values-v17/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="PagedViewWidgetImageView">
+ <item name="android:paddingStart">@dimen/app_widget_preview_padding_left</item>
+ </style>
+ <style name="SearchButton.WithPaddingStart">
+ <item name="android:paddingStart">8dp</item>
+ </style>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ed531f0..c9834f8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -155,4 +155,10 @@
</style>
<style name="CustomClingText">
</style>
+ <style name="PagedViewWidgetImageView">
+ <item name="android:paddingLeft">@dimen/app_widget_preview_padding_left</item>
+ </style>
+ <style name="SearchButton.WithPaddingStart">
+ <item name="android:paddingLeft">8dp</item>
+ </style>
</resources>