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

Commit 3b9df00c authored by Edgar Wang's avatar Edgar Wang
Browse files

Rename resource name to avoid build conflict in another path. 

Bug: 186881512
Test: manual & robotest
Change-Id: I2545c07e9a0e7cb77cf942605fcc447cb387c5ec
parent d5c7dc04

packages/SettingsLib/MainSwitchPreference/lint-baseline.xml

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
        errorLine1="        android:id="@android:id/switch_widget""

        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/layout/main_switch_bar.xml"

            file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml"

            line="49"

            column="9"/>

    </issue>
@@ -15,7 +15,7 @@ 
    <issue

        id="NewApi"

        message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)"

        errorLine1="    &lt;style name=&quot;Settings.MainSwitch&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>"

        errorLine1="    &lt;style name=&quot;MainSwitch.Settingslib&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>"

        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml"
@@ -26,7 +26,7 @@ 
    <issue

        id="NewApi"

        message="`@android:style/Widget.Material.CompoundButton.Switch` requires API level 24 (current min is 21)"

        errorLine1="    &lt;style name=&quot;Widget.SwitchBar.Switch&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>"

        errorLine1="    &lt;style name=&quot;SwitchBar.Switch.Settingslib&quot; parent=&quot;@android:style/Widget.Material.CompoundButton.Switch&quot;>"

        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml"
@@ -37,7 +37,7 @@ 
    <issue

        id="NewApi"

        message="`android:trackTint` requires API level 23 (current min is 21)"

        errorLine1="        &lt;item name=&quot;android:trackTint&quot;>@color/switchbar_switch_track_tint&lt;/item>"

        errorLine1="        &lt;item name=&quot;android:trackTint&quot;>@color/settingslib_switchbar_switch_track_tint&lt;/item>"

        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/packages/SettingsLib/MainSwitchPreference/res/values/styles.xml"

packages/SettingsLib/MainSwitchPreference/res/drawable/switch_bar_bg_off.xml→packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_disabled.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    android:color="?android:attr/colorControlHighlight">

    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/state_off_color"/>

            <corners android:radius="@dimen/switch_bar_radius"/>

            <solid android:color="@color/settingslib_state_off_color"/>

            <corners android:radius="@dimen/settingslib_switch_bar_radius"/>

        </shape>

    </item>

</ripple>

packages/SettingsLib/MainSwitchPreference/res/drawable/switch_bar_bg_on.xml→packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_off.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    android:color="?android:attr/colorControlHighlight">

    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/state_on_color"/>

            <corners android:radius="@dimen/switch_bar_radius"/>

            <solid android:color="@color/settingslib_state_off_color"/>

            <corners android:radius="@dimen/settingslib_switch_bar_radius"/>

        </shape>

    </item>

</ripple>

packages/SettingsLib/MainSwitchPreference/res/drawable/switch_bar_bg_disabled.xml→packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_switch_bar_bg_on.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    android:color="?android:attr/colorControlHighlight">

    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/state_off_color"/>

            <corners android:radius="@dimen/switch_bar_radius"/>

            <solid android:color="@color/settingslib_state_on_color"/>

            <corners android:radius="@dimen/settingslib_switch_bar_radius"/>

        </shape>

    </item>

</ripple>

packages/SettingsLib/MainSwitchPreference/res/drawable/thumb_disabled.xml→packages/SettingsLib/MainSwitchPreference/res/drawable/settingslib_thumb_disabled.xml

+7 −7
Original line number Diff line number Diff line
@@ -17,16 +17,16 @@ 


<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:top="@dimen/switch_thumb_margin"

        android:left="@dimen/switch_thumb_margin"

        android:right="@dimen/switch_thumb_margin"

        android:bottom="@dimen/switch_thumb_margin">

        android:top="@dimen/settingslib_switch_thumb_margin"

        android:left="@dimen/settingslib_switch_thumb_margin"

        android:right="@dimen/settingslib_switch_thumb_margin"

        android:bottom="@dimen/settingslib_switch_thumb_margin">

        <shape android:shape="oval">

            <size

                android:height="@dimen/switch_thumb_size"

                android:width="@dimen/switch_thumb_size"/>

                android:height="@dimen/settingslib_switch_thumb_size"

                android:width="@dimen/settingslib_switch_thumb_size"/>

            <solid

                android:color="@color/state_off_color"

                android:color="@color/settingslib_state_off_color"

                android:alpha="?android:attr/disabledAlpha"/>

        </shape>

    </item>