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

Commit bc429199 authored by Richard MacGregor's avatar Richard MacGregor Committed by Android (Google) Code Review
Browse files

Merge "[XPD] Support Switch style injection" into main

parents 47969d86 482dd9bc

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

+1 −1
Original line number Diff line number Diff line
@@ -20,4 +20,4 @@ 
    android:theme="@style/Theme.Material3.DynamicColors.DayNight"

    android:id="@+id/switchWidget"

    android:filterTouchesWhenObscured="false"

    style="@style/SettingslibSwitchStyle.Expressive"/>
 
 No newline at end of file
 
    style="?expressiveSwitchStyle"/>
 
 No newline at end of file

packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
        <!-- Set up edge-to-edge configuration for top app bar -->

        <item name="android:clipToPadding">false</item>

        <item name="android:clipChildren">false</item>



        <!-- For Expressive Switch -->

        <item name="expressiveSwitchStyle">@style/SettingslibSwitchStyle.Expressive</item>

    </style>



    <!-- Using in SubSettings page including injected settings page -->

packages/SettingsLib/SettingsTheme/res/values/attrs_expressive.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,4 +22,6 @@ 
        <!-- Specifies that the textView is collapsable. -->

        <attr name="isCollapsable" format="boolean"/>

    </declare-styleable>



    <attr name="expressiveSwitchStyle" format="reference" />

</resources>
 
 No newline at end of file