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

Commit 2eff83dc authored by Artur Satayev's avatar Artur Satayev Committed by android-build-merger
Browse files

Merge "Use new UnsupportedAppUsage annotation." 

am: 57a0beab

Change-Id: I7bae7b4226e18f1e75d8973c61d58041a462b77c
parents 62169a75 57a0beab

graphics/java/android/graphics/drawable/ColorDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.ColorInt; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.pm.ActivityInfo.Config;

import android.content.res.ColorStateList;

import android.content.res.Resources;

graphics/java/android/graphics/drawable/Drawable.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.annotation.IntRange; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.pm.ActivityInfo.Config;

import android.content.res.ColorStateList;

import android.content.res.Resources;

graphics/java/android/graphics/drawable/DrawableContainer.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.graphics.drawable;



import android.annotation.NonNull;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.pm.ActivityInfo.Config;

import android.content.res.ColorStateList;

import android.content.res.Resources;

graphics/java/android/graphics/drawable/DrawableInflater.java

+4 −4
Original line number Diff line number Diff line
@@ -16,19 +16,19 @@ 


package android.graphics.drawable;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import android.annotation.DrawableRes;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.util.AttributeSet;

import android.view.InflateException;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;

import java.lang.reflect.Constructor;

import java.util.HashMap;

graphics/java/android/graphics/drawable/DrawableWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.graphics.drawable; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.pm.ActivityInfo.Config;

import android.content.res.ColorStateList;

import android.content.res.Resources;