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

Commit cfe80100 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Fix lint error for those module used in mainline module am: d56251ba 

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

Change-Id: I752af070ea1c8922715722813d4c2b0b9a946015
parents 24bf4abd d56251ba

packages/SettingsLib/ActionBarShadow/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ android_library { 
    ],



    sdk_version: "system_current",

    min_sdk_version: "21",

    min_sdk_version: "28",

}

packages/SettingsLib/ActionBarShadow/lint-baseline.xml

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">



    <issue

        id="NewApi"

        message="Call requires API level 23 (current min is 21): `android.view.View#setOnScrollChangeListener`"

        errorLine1="            mScrollView.setOnScrollChangeListener(mScrollChangeWatcher);"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java"

            line="81"

            column="25"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 23 (current min is 21): `android.view.View#setOnScrollChangeListener`"

        errorLine1="        mScrollView.setOnScrollChangeListener(null);"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java"

            line="88"

            column="21"/>

    </issue>



    <issue

        id="NewApi"

        message="Class requires API level 23 (current min is 21): `android.view.View.OnScrollChangeListener`"

        errorLine1="    final class ScrollChangeWatcher implements View.OnScrollChangeListener {"

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

        <location

            file="frameworks/base/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java"

            line="95"

            column="48"/>

    </issue>



</issues>

packages/SettingsLib/ActionButtonsPreference/lint-baseline.xml

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">



    <issue

        id="NewApi"

        message="`android:Widget.DeviceDefault.Button.Borderless.Colored` requires API level 28 (current min is 21)"

        errorLine1="    &lt;style name=&quot;SettingsActionButton&quot; parent=&quot;android:Widget.DeviceDefault.Button.Borderless.Colored&quot;>"

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

        <location

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

            line="19"

            column="40"/>

    </issue>



    <issue

        id="NewApi"

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

        errorLine1="        &lt;item name=&quot;android:drawableTint&quot;>@*android:color/btn_colored_borderless_text_material&lt;/item>"

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

        <location

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

            line="21"

            column="15"/>

    </issue>



    <issue

        id="NewApi"

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

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

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

        <location

            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>



</issues>

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


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

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

       xmlns:tools="http://schemas.android.com/tools"

       tools:targetApi="28"

       android:shape="rectangle">

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

    <corners

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

+15 −13
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.

    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"

       xmlns:tools="http://schemas.android.com/tools"

       tools:targetApi="28"

       android:shape="rectangle">

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

    <corners