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

Commit d573f1d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make preference title align after icon" into sc-dev

parents 72dd0830 600d0238

res/layout/restricted_preference_dropdown.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ 
            android:visibility="invisible"

            android:layout_marginStart="@dimen/preference_no_icon_padding_start"/>



    <include layout="@layout/preference_material" />

    <include layout="@layout/settingslib_preference" />



</FrameLayout>
 
 No newline at end of file

res/layout/running_processes_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,5 +31,5 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_toStartOf="@id/widget_summary"

        layout="@layout/preference_material"/>

        layout="@layout/preference_app"/>

</RelativeLayout>
 
 No newline at end of file

res/layout/storage_item.xml

+1 −16
Original line number Diff line number Diff line
@@ -35,22 +35,7 @@ 
        android:clipToPadding="false"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart">



        <LinearLayout

            android:id="@+id/icon_frame"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="start|center_vertical"

            android:minWidth="56dp"

            android:orientation="horizontal"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <com.android.internal.widget.PreferenceImageView

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:maxWidth="24dp"

                android:maxHeight="24dp"/>

        </LinearLayout>

        <include layout="@layout/settingslib_icon_frame"/>



        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

res/values/styles_preference.xml

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
    <style name="SettingsMultiSelectListPreference" parent="@style/Preference.Material">

        <item name="android:positiveButtonText">@android:string/ok</item>

        <item name="android:negativeButtonText">@android:string/cancel</item>

        <item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>

    </style>



    <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material">

res/xml/mobile_network_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ 
            android:title="@string/call_category"

            settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController">



            <PreferenceScreen

            <Preference

                android:key="wifi_calling"

                android:title="@string/wifi_calling_settings_title"

                android:summary="@string/wifi_calling_summary"
@@ -173,7 +173,7 @@ 
                        android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">

                    <extra android:name="show_drawer_menu" android:value="true"/>

                </intent>

            </PreferenceScreen>

            </Preference>



            <SwitchPreference

                android:key="video_calling_key"