Merge "Use a common style for custom preference icon layouts"
diff --git a/res/layout/expand_preference.xml b/res/layout/expand_preference.xml
index f17e67c..729dfd9 100644
--- a/res/layout/expand_preference.xml
+++ b/res/layout/expand_preference.xml
@@ -28,10 +28,10 @@
android:clipToPadding="false">
<LinearLayout
- android:id="@+id/icon_container"
+ android:id="@+id/icon_frame"
+ style="@style/preference_icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:minWidth="56dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingEnd="12dp"
diff --git a/res/layout/preference_material_settings.xml b/res/layout/preference_material_settings.xml
index 9682e32..e2ab3bb 100644
--- a/res/layout/preference_material_settings.xml
+++ b/res/layout/preference_material_settings.xml
@@ -28,10 +28,10 @@
android:clipToPadding="false">
<LinearLayout
- android:id="@+id/icon_container"
+ android:id="@+id/icon_frame"
+ style="@style/preference_icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:minWidth="56dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingEnd="12dp"
diff --git a/res/layout/preference_small_icon.xml b/res/layout/preference_small_icon.xml
index a9f4c2f..e734b4b 100644
--- a/res/layout/preference_small_icon.xml
+++ b/res/layout/preference_small_icon.xml
@@ -29,10 +29,10 @@
android:focusable="true" >
<LinearLayout
- android:id="@android:id/icon_frame"
+ android:id="@+id/icon_frame"
+ style="@style/preference_icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:minWidth="56dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingEnd="12dp"
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 3eb0c97..107a8ae 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -26,7 +26,7 @@
android:orientation="horizontal">
<LinearLayout
- android:id="@+id/icon_container"
+ android:id="@+id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="44dp"
diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index 0c1f60c..a234dc0 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -20,24 +20,26 @@
android:orientation="vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="16dip"
android:paddingBottom="16dip"
- android:background="?android:attr/selectableItemBackground">
+ android:background="?android:attr/selectableItemBackground"
+ android:clipToPadding="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:clipToPadding="false"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<LinearLayout
- android:id="@android:id/icon_frame"
+ android:id="@+id/icon_frame"
+ style="@style/preference_icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
- android:minWidth="60dp"
android:orientation="horizontal"
android:paddingEnd="12dp"
android:paddingTop="4dp"
@@ -76,7 +78,7 @@
android:id="@android:id/progress"
android:layout_width="match_parent"
android:layout_height="8dp"
- android:layout_marginStart="60dp"
+ android:layout_marginStart="72dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:visibility="gone"
diff --git a/res/layout/storage_volume.xml b/res/layout/storage_volume.xml
index 570cec6..39a6f85 100644
--- a/res/layout/storage_volume.xml
+++ b/res/layout/storage_volume.xml
@@ -26,10 +26,9 @@
<LinearLayout
android:id="@+id/icon_frame"
+ style="@style/preference_icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="-4dp"
- android:minWidth="60dp"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingEnd="12dp"
diff --git a/tests/app/src/com/android/settings/dashboard/FirstIdViewMatcher.java b/tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
similarity index 100%
rename from tests/app/src/com/android/settings/dashboard/FirstIdViewMatcher.java
rename to tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
diff --git a/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
similarity index 95%
rename from tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
rename to tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
index 22723a6..16e309d 100644
--- a/tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
+++ b/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
@@ -58,8 +58,7 @@
@Test
public void startPhoneStatus_preferenceIconSpaceReserved() throws InterruptedException {
launchPhoneStatus();
- onView(withId(R.id.icon_frame)).check(doesNotExist());
- onView(withFirstId(R.id.icon_container)).check(matches(isDisplayed()));
+ onView(withFirstId(R.id.icon_frame)).check(matches(isDisplayed()));
}
@Test