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

Commit 8718341a authored by Zhibin Liu's avatar Zhibin Liu Committed by Android (Google) Code Review
Browse files

Merge "Replace @hide API PathParser with androidx version" into main

parents 769b9e5b c71d2e41

packages/SettingsLib/AdaptiveIcon/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ android_library { 
    resource_dirs: ["res"],



    static_libs: [

        "androidx.annotation_annotation",

        "SettingsLibTile",

        "androidx.annotation_annotation",

        "androidx.core_core",

    ],



    min_sdk_version: "21",

packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveIconShapeDrawable.java

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ import android.graphics.drawable.AdaptiveIconDrawable; 
import android.graphics.drawable.ShapeDrawable;

import android.graphics.drawable.shapes.PathShape;

import android.util.AttributeSet;

import android.util.PathParser;



import androidx.core.graphics.PathParser;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

packages/SettingsLib/AdaptiveIcon/src/com/android/settingslib/widget/AdaptiveOutlineDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ import android.graphics.Rect; 
import android.graphics.drawable.AdaptiveIconDrawable;

import android.graphics.drawable.DrawableWrapper;

import android.os.RemoteException;

import android.util.PathParser;

import android.view.IWindowManager;

import android.view.WindowManagerGlobal;



import androidx.annotation.IntDef;

import androidx.annotation.VisibleForTesting;

import androidx.core.graphics.PathParser;



import com.android.settingslib.widget.adaptiveicon.R;