PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use a common style for custom preference icon layouts"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-01 08:40:39 +00:00
committed by Android (Google) Code Review
parent 7359c0d5f4 c2b0c7bf31
commit 0a53489248
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/expand_preference.xml
View File

@@ -28,10 +28,10 @@
android:clipToPadding="false"> android:clipToPadding="false">
<LinearLayout <LinearLayout
android:id="@+id/icon_container" android:id="@+id/icon_frame"
style="@style/preference_icon_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="56dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="12dp" android:paddingEnd="12dp"

4
res/layout/preference_material_settings.xml
View File

@@ -28,10 +28,10 @@
android:clipToPadding="false"> android:clipToPadding="false">
<LinearLayout <LinearLayout
android:id="@+id/icon_container" android:id="@+id/icon_frame"
style="@style/preference_icon_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="56dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="12dp" android:paddingEnd="12dp"

4
res/layout/preference_small_icon.xml
View File

@@ -29,10 +29,10 @@
android:focusable="true" > android:focusable="true" >
<LinearLayout <LinearLayout
android:id="@android:id/icon_frame" android:id="@+id/icon_frame"
style="@style/preference_icon_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="56dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="12dp" android:paddingEnd="12dp"

2
res/layout/preference_volume_slider.xml
View File

@@ -26,7 +26,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/icon_container" android:id="@+id/icon_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="44dp" android:minWidth="44dp"

14
res/layout/storage_item.xml
View File

@@ -20,24 +20,26 @@
android:orientation="vertical" android:orientation="vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="16dip" android:paddingTop="16dip"
android:paddingBottom="16dip" android:paddingBottom="16dip"
android:background="?android:attr/selectableItemBackground"> android:background="?android:attr/selectableItemBackground"
android:clipToPadding="false">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal"
android:clipToPadding="false"
android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<LinearLayout <LinearLayout
android:id="@android:id/icon_frame" android:id="@+id/icon_frame"
style="@style/preference_icon_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:minWidth="60dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:paddingTop="4dp" android:paddingTop="4dp"
@@ -76,7 +78,7 @@
android:id="@android:id/progress" android:id="@android:id/progress"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="8dp" android:layout_height="8dp"
android:layout_marginStart="60dp" android:layout_marginStart="72dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:visibility="gone" android:visibility="gone"

3
res/layout/storage_volume.xml
View File

@@ -26,10 +26,9 @@
<LinearLayout <LinearLayout
android:id="@+id/icon_frame" android:id="@+id/icon_frame"
style="@style/preference_icon_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="-4dp"
android:minWidth="60dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="12dp" android:paddingEnd="12dp"

0
tests/app/src/com/android/settings/dashboard/FirstIdViewMatcher.java → tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
View File

3
tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java → tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
View File

@@ -58,8 +58,7 @@ public class PreferenceThemeTest {
@Test @Test
public void startPhoneStatus_preferenceIconSpaceReserved() throws InterruptedException { public void startPhoneStatus_preferenceIconSpaceReserved() throws InterruptedException {
launchPhoneStatus(); launchPhoneStatus();
onView(withId(R.id.icon_frame)).check(doesNotExist()); onView(withFirstId(R.id.icon_frame)).check(matches(isDisplayed()));
onView(withFirstId(R.id.icon_container)).check(matches(isDisplayed()));
} }
@Test @Test