Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bddacbd5 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] update widget_frame layout" into main

parents 8c2e9bec 3c5b9934

packages/SettingsLib/BulletPreference/res/layout/settingslib_expressive_bullet_preference.xml

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"

        android:paddingStart="@dimen/settingslib_expressive_space_small1"

        android:paddingEnd="0dp"

        android:minWidth="@dimen/settingslib_expressive_space_medium4"

        android:orientation="vertical"/>



</LinearLayout>
 
 No newline at end of file

packages/SettingsLib/MenuPreference/res/layout/settingslib_expressive_preference_ordermenu.xml

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"

        android:paddingStart="@dimen/settingslib_expressive_space_small1"

        android:paddingEnd="0dp"

        android:minWidth="@dimen/settingslib_expressive_space_medium4"

        android:orientation="vertical"/>



</LinearLayout>
 
 No newline at end of file

packages/SettingsLib/SelectorWithWidgetPreference/res/layout-v36/settingslib_preference_selector_with_widget.xml

+2 −3
Original line number Diff line number Diff line
@@ -101,12 +101,11 @@ 
        <ImageView

            android:id="@+id/selector_extra_widget"

            android:layout_width="match_parent"

            android:minWidth="@dimen/two_target_min_width"

            android:minWidth="@dimen/settingslib_expressive_space_medium4"

            android:layout_height="fill_parent"

            android:src="@drawable/ic_settings_accent"

            android:scaleType="centerInside"

            android:contentDescription="@string/settings_label"

            android:paddingStart="@dimen/settingslib_expressive_space_small4"

            android:paddingEnd="@dimen/settingslib_expressive_space_small4"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground"/>

    </LinearLayout>

packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference.xml

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="end|center_vertical"

        android:paddingStart="@dimen/settingslib_expressive_space_small1"

        android:paddingEnd="0dp"

        android:minWidth="@dimen/settingslib_expressive_space_medium4"

        android:orientation="vertical"/>



</LinearLayout>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_dropdown.xml

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:gravity="end|center_vertical"

            android:paddingStart="@dimen/settingslib_expressive_space_small1"

            android:paddingEnd="0dp"

            android:minWidth="@dimen/settingslib_expressive_space_medium4"

            android:orientation="vertical"/>

    </LinearLayout>

</FrameLayout>
 
 No newline at end of file