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

Commit 4f61f588 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15619363, 15619364, 15619365, 15619399, 15619400,... 

Merge cherrypicks of [15619363, 15619364, 15619365, 15619399, 15619400, 15619401, 15619366, 15619367, 15619368, 15619369, 15619424, 15619425, 15619426, 15619427, 15619428, 15619402, 15619403, 15619404, 15619370, 15619371, 15619372, 15619373, 15618427, 15619429, 15619405, 15619406, 15619407, 15619408, 15619374, 15619375, 15619409] into sc-d1-release

Change-Id: I3f325119268052e46c64712ef8ed6b17d4c884f6
parents fc4f37d4 90e437d5

core/java/android/view/translation/UiTranslationController.java

+10 −2
Original line number Diff line number Diff line
@@ -356,7 +356,11 @@ public class UiTranslationController { 
            }

            for (int i = 0; i < translatedResult.size(); i++) {

                final AutofillId autofillId = new AutofillId(translatedResult.keyAt(i));

                final View view = mViews.get(autofillId).get();

                final WeakReference<View> viewRef = mViews.get(autofillId);

                if (viewRef == null) {

                    continue;

                }

                final View view = viewRef.get();

                if (view == null) {

                    Log.w(TAG, "onTranslationCompleted: the view for autofill id " + autofillId

                            + " may be gone.");
@@ -416,7 +420,11 @@ public class UiTranslationController { 
                    Log.w(TAG, "No AutofillId is set in ViewTranslationResponse");

                    continue;

                }

                final View view = mViews.get(autofillId).get();

                final WeakReference<View> viewRef = mViews.get(autofillId);

                if (viewRef == null) {

                    continue;

                }

                final View view = viewRef.get();

                if (view == null) {

                    Log.w(TAG, "onTranslationCompleted: the view for autofill id " + autofillId

                            + " may be gone.");

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