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

Commit 51ba1f1a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apply new style for SwitchPreference" into sc-dev am: acbeea2b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14100407

Change-Id: I22dfe650fcab93644494ec74975dcbff278bf27d
parents 407346c1 acbeea2b

packages/SettingsLib/AppPreference/res/layout/preference_app.xml

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

        android:layout_height="match_parent"

        android:gravity="center_vertical|end"

        android:minWidth="64dp"

        android:minWidth="@dimen/two_target_min_width"

        android:orientation="vertical"/>



</LinearLayout>

packages/SettingsLib/MainSwitchPreference/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ android_library { 


    static_libs: [

        "androidx.preference_preference",

        "SettingsLibSettingsTheme",

    ],



    sdk_version: "system_current",

packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml

+0 −9
Original line number Diff line number Diff line
@@ -18,13 +18,4 @@ 
<resources>

    <color name="settingslib_switchbar_switch_track_tint">#82000000</color>

    <color name="settingslib_switchbar_switch_thumb_tint">@android:color/black</color>



    <!-- Material next thumb off color-->

    <color name="settingslib_thumb_off_color">@android:color/system_neutral2_300</color>



    <!-- Material next track on color-->

    <color name="settingslib_track_on_color">@android:color/system_accent2_700</color>



    <!-- Material next track off color-->

    <color name="settingslib_track_off_color">@android:color/system_neutral1_700</color>

</resources>

packages/SettingsLib/MainSwitchPreference/res/values/colors.xml

+0 −15
Original line number Diff line number Diff line
@@ -19,19 +19,4 @@ 
    <color name="settingslib_switchbar_background_color">@*android:color/material_grey_600</color>

    <color name="settingslib_switchbar_switch_track_tint">#BFFFFFFF</color>

    <color name="settingslib_switchbar_switch_thumb_tint">@android:color/white</color>



    <!-- Material next state on color-->

    <color name="settingslib_state_on_color">?androidprv:attr/colorAccentPrimary</color>



    <!-- Material next state off color-->

    <color name="settingslib_state_off_color">?androidprv:attr/colorAccentSecondary</color>



    <!-- Material next thumb off color-->

    <color name="settingslib_thumb_off_color">@android:color/system_neutral2_100</color>



    <!-- Material next track on color-->

    <color name="settingslib_track_on_color">?androidprv:attr/colorAccentPrimaryVariant</color>



    <!-- Material next track off color-->

    <color name="settingslib_track_off_color">@android:color/system_neutral2_600</color>

</resources>

packages/SettingsLib/RadioButtonPreference/res/layout/preference_radio.xml

+7 −5
Original line number Diff line number Diff line
@@ -58,13 +58,14 @@ 
        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingTop="16dp"

        android:paddingBottom="16dp">

        android:paddingBottom="16dp"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:maxLines="2"

            android:textAppearance="?android:attr/textAppearanceListItem"/>



        <LinearLayout
@@ -109,12 +110,13 @@ 
            android:background="?android:attr/dividerVertical" />

        <ImageView

            android:id="@+id/radio_extra_widget"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:minWidth="@dimen/two_target_min_width"

            android:layout_height="fill_parent"

            android:src="@drawable/ic_settings_accent"

            android:contentDescription="@string/settings_label"

            android:paddingStart="16dp"

            android:paddingEnd="16dp"

            android:paddingStart="24dp"

            android:paddingEnd="24dp"

            android:layout_gravity="center"

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

    </LinearLayout>