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

Commit 627480d9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use new UnsupportedAppUsage annotation." am: 70a89435 am: 4220fc33 

Change-Id: I0960879c5cd2791fa7cc27746474d6ebf2f61c9e
parents 6f9a1f9f 4220fc33

core/java/android/widget/CompoundButton.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.widget; 
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.ColorStateList;

import android.content.res.TypedArray;

core/java/android/widget/CursorAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package android.widget;



import android.annotation.UnsupportedAppUsage;

import android.annotation.WorkerThread;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Resources;

import android.database.ContentObserver;

core/java/android/widget/DatePicker.java

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package android.widget; 
import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.annotation.Widget;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

core/java/android/widget/DatePickerSpinnerDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.widget;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

core/java/android/widget/DateTimeView.java

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import static android.text.format.DateUtils.HOUR_IN_MILLIS; 
import static android.text.format.DateUtils.MINUTE_IN_MILLIS;

import static android.text.format.DateUtils.YEAR_IN_MILLIS;



import android.annotation.UnsupportedAppUsage;

import android.app.ActivityThread;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;