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

Commit 921ae05c authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Create selector colors for dialog buttons" into udc-qpr-dev am: c888cf64 am: c7c02ba2 

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



Change-Id: Ifd7cb9c2b4e656ea761bbc4dcef623750fb13b8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79a3de34 c7c02ba2

packages/SystemUI/res/color/qs_dialog_btn_filled_large_background.xml

0 → 100644
+22 −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"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_enabled="false"

        android:color="?androidprv:attr/materialColorPrimaryFixed"

        android:alpha="0.30"/>

    <item android:color="?androidprv:attr/materialColorPrimaryFixed"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/qs_dialog_btn_filled_large_text.xml

0 → 100644
+22 −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"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_enabled="false"

        android:color="?androidprv:attr/materialColorOnPrimaryFixed"

        android:alpha="0.30"/>

    <item android:color="?androidprv:attr/materialColorOnPrimaryFixed"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/qs_dialog_btn_outline.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"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_enabled="false"

        android:color="?androidprv:attr/materialColorPrimary"

        android:alpha="0.30"/>

    <item android:color="?androidprv:attr/materialColorPrimary"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/color/qs_dialog_btn_outline_text.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"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:state_enabled="false"

        android:color="?androidprv:attr/materialColorOnSurface"

        android:alpha="0.30"/>

    <item android:color="?androidprv:attr/materialColorOnSurface"/>

</selector>
 
 No newline at end of file

packages/SystemUI/res/drawable/qs_dialog_btn_filled_large.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <item>

        <shape android:shape="rectangle">

            <corners android:radius="18dp"/>

            <solid android:color="?androidprv:attr/materialColorPrimaryFixed"/>

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

        </shape>

    </item>

</ripple>