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

Commit 46e54925 authored by David Liu's avatar David Liu Committed by Automerger Merge Worker
Browse files

Merge "Update text color on MainSwitch" into udc-dev am: c6b780a5 

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



Change-Id: Ic797b7c882e0c498577e50c0f729eb1b63cfcf50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b6ba436 c6b780a5

packages/SettingsLib/MainSwitchPreference/res/color-night-v34/settingslib_main_switch_text_color.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2023 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false"

          android:color="@android:color/system_accent1_100"

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

    <item android:color="@android:color/system_accent1_100"/>

</selector>
 
 No newline at end of file

packages/SettingsLib/MainSwitchPreference/res/color-v31/settingslib_main_switch_text_color.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2023 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false"

          android:color="@android:color/black"

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

    <item android:color="@android:color/black"/>

</selector>
 
 No newline at end of file

packages/SettingsLib/MainSwitchPreference/res/color-v34/settingslib_main_switch_text_color.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2023 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_enabled="false"

          android:color="@android:color/system_accent1_900"

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

    <item android:color="@android:color/system_accent1_900"/>

</selector>
 
 No newline at end of file

packages/SettingsLib/MainSwitchPreference/res/values-v31/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ 
    <style name="MainSwitchText.Settingslib" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title.Inverse">

        <item name="android:textSize">20sp</item>

        <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>

        <item name="android:textColor">@android:color/black</item>

        <item name="android:textColor">@color/settingslib_main_switch_text_color</item>

    </style>

</resources>

packages/SettingsLib/SettingsTheme/res/color-night-v34/settingslib_switch_track_outline_color.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2023 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Disabled status of thumb -->

    <item android:state_enabled="false"

          android:color="@android:color/system_neutral2_400"

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

    <!-- Toggle off status of thumb -->

    <item android:state_checked="false"

          android:color="@android:color/system_neutral2_400" />

    <!-- Enabled or toggle on status of thumb -->

    <item android:color="@color/settingslib_track_on_color" />

</selector>
 
 No newline at end of file