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

Commit 1c77a89a authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: I6e16664c4e339adb76f30f27a44a2d85ea07f24d
Change-Id: Ie6f01e64e1661f7441e8f5dab2c0f57a6bd90c2b
parents 861dcd6d 76b73572

iconloaderlib/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package { 


android_library {

    name: "iconloader_base",

    sdk_version: "28",

    sdk_version: "current",

    min_sdk_version: "21",

    static_libs: [

        "androidx.core_core",

iconloaderlib/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ android { 
    buildToolsVersion BUILD_TOOLS_VERSION



    defaultConfig {

        minSdkVersion 25

        minSdkVersion 26

        targetSdkVersion 28

        versionCode 1

        versionName "1.0"

iconloaderlib/lint-baseline.xml

+77 −0
Original line number Diff line number Diff line
@@ -67,4 +67,81 @@ 
            column="9"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 26 (current min is 21): `new android.graphics.drawable.AdaptiveIconDrawable`"

        errorLine1="        AdaptiveIconDrawable drawable = new AdaptiveIconDrawable("

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

        <location

            file="frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java"

            line="97"

            column="41"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 26 (current min is 21): `android.graphics.drawable.AdaptiveIconDrawable#getIconMask`"

        errorLine1="        return new Path(drawable.getIconMask());"

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

        <location

            file="frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/GraphicsUtils.java"

            line="100"

            column="34"/>

    </issue>



    <issue

        id="NewApi"

        message="Method reference requires API level 22 (current min is 21): `ActivityInfo::loadUnbadgedIcon`"

        errorLine1="            ActivityInfo::loadUnbadgedIcon;"

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

        <location

            file="frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java"

            line="64"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 24 (current min is 21): `android.os.UserHandle#getUserHandleForUid`"

        errorLine1="                UserHandle.getUserHandleForUid(info.applicationInfo.uid),"

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

        <location

            file="frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java"

            line="126"

            column="28"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 23 (current min is 21): `android.content.Context#getSystemService`"

        errorLine1="                        : context.getSystemService(UserManager.class).getUserProfiles()) {"

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

        <location

            file="frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java"

            line="252"

            column="35"/>

    </issue>



    <issue

        id="NewApi"

        message="Class requires API level 23 (current min is 21): `android.graphics.drawable.DrawableWrapper`"

        errorLine1="public class RoundDrawableWrapper extends DrawableWrapper {"

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

        <location

            file="frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/RoundDrawableWrapper.java"

            line="29"

            column="43"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 23 (current min is 21): `new android.graphics.drawable.DrawableWrapper`"

        errorLine1="        super(dr);"

        errorLine2="        ~~~~~">

        <location

            file="frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/RoundDrawableWrapper.java"

            line="36"

            column="9"/>

    </issue>



</issues>

iconloaderlib/res/values/attrs.xml

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

<!--

**

** Copyright 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.

*/

-->

<resources>

    <attr name="disabledIconAlpha" format="float" />

    <attr name="loadingIconColor" format="color" />



</resources>
 
 No newline at end of file

iconloaderlib/res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -18,4 +18,7 @@ 
-->

<resources>

    <color name="legacy_icon_background">#FFFFFF</color>



    <!-- Yellow 600, used for highlighting "important" conversations in settings & notifications -->

    <color name="important_conversation">#f9ab00</color>

</resources>