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

Commit ce906a89 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix ActionButtons background and ripple" into sc-dev am: b6475f9e 

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

Change-Id: I824780911d783303cb6f2c8d00a3ef49879b7b4c
parents d30eff12 b6475f9e

packages/SettingsLib/ActionButtonsPreference/lint-baseline.xml

+46 −2
Original line number Diff line number Diff line
@@ -26,10 +26,54 @@ 
    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:radius=&quot;?android:attr/dialogCornerRadius&quot;"

        errorLine1="        android:topLeftRadius=&quot;?android:attr/dialogCornerRadius&quot;"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/settingslib_rounded_background.xml"

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml"

            line="23"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:bottomLeftRadius=&quot;?android:attr/dialogCornerRadius&quot;"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml"

            line="25"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:topRightRadius=&quot;?android:attr/dialogCornerRadius&quot;"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml"

            line="24"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:bottomRightRadius=&quot;?android:attr/dialogCornerRadius&quot;"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml"

            line="26"

            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 21)"

        errorLine1="        android:bottomRightRadius=&quot;?android:attr/dialogCornerRadius&quot;"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml"

            line="23"

            column="9"/>

    </issue>

packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->



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

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

       android:shape="rectangle">

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

    <corners

        android:topLeftRadius="?android:attr/dialogCornerRadius"

        android:topRightRadius="0dp"

        android:bottomLeftRadius="?android:attr/dialogCornerRadius"

        android:bottomRightRadius="0dp"

    />

</shape>
 
 No newline at end of file

packages/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->



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

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

       android:shape="rectangle">

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

    <corners

        android:topLeftRadius="0dp"

        android:topRightRadius="?android:attr/dialogCornerRadius"

        android:bottomLeftRadius="0dp"

        android:bottomRightRadius="?android:attr/dialogCornerRadius"

    />

</shape>
 
 No newline at end of file

packages/SettingsLib/ActionButtonsPreference/res/drawable/left_rounded_ripple.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->



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

        android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@drawable/half_rounded_left_bk"/>

</ripple>
 
 No newline at end of file

packages/SettingsLib/ActionButtonsPreference/res/drawable/right_rounded_ripple.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->



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

        android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@drawable/half_rounded_right_bk"/>

</ripple>
 
 No newline at end of file