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

Commit b922dccb authored by Andy Wickham's avatar Andy Wickham
Browse files

Cleanup API checks for P, Q, and R. 

Test: Build with gradle
Flag: NA
Change-Id: I3ef17090741d14bebd76cf09cf3dc5ac4f11e686
parent a601341f

quickstep/src/com/android/launcher3/LauncherAnimationRunner.java

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ import static com.android.systemui.shared.recents.utilities.Utilities.postAtFron 
import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.annotation.TargetApi;

import android.content.Context;

import android.os.Build;

import android.os.Handler;

import android.os.RemoteException;

import android.view.IRemoteAnimationFinishedCallback;
@@ -57,7 +55,6 @@ import java.lang.ref.WeakReference; 
 * the runner implementation.  When this animation manager is destroyed, we remove the Launcher

 * reference to the runner, leaving only the weak ref from the runner.

 */

@TargetApi(Build.VERSION_CODES.P)

public class LauncherAnimationRunner extends RemoteAnimationRunnerCompat {



    private static final RemoteAnimationFactory DEFAULT_FACTORY =

quickstep/src/com/android/launcher3/LauncherInitListener.java

+0 −4
Original line number Diff line number Diff line
@@ -15,14 +15,10 @@ 
 */

package com.android.launcher3;



import android.annotation.TargetApi;

import android.os.Build;



import com.android.quickstep.util.ActivityInitListener;



import java.util.function.BiPredicate;



@TargetApi(Build.VERSION_CODES.P)

public class LauncherInitListener extends ActivityInitListener<Launcher> {



    /**

quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java

+0 −3
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 


package com.android.launcher3.appprediction;



import android.annotation.TargetApi;

import android.content.Context;

import android.graphics.Canvas;

import android.os.Build;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.View;
@@ -50,7 +48,6 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.stream.Collectors;



@TargetApi(Build.VERSION_CODES.P)

public class PredictionRowView<T extends Context & ActivityContext>

        extends LinearLayout implements OnDeviceProfileChangeListener, FloatingHeaderRow {

quickstep/src/com/android/launcher3/model/AppEventProducer.java

+0 −3
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ import static com.android.launcher3.model.PredictionHelper.isTrackedForHotseatPr 
import static com.android.launcher3.model.PredictionHelper.isTrackedForWidgetPrediction;

import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;



import android.annotation.TargetApi;

import android.app.prediction.AppTarget;

import android.app.prediction.AppTargetEvent;

import android.app.prediction.AppTargetId;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ShortcutInfo;

import android.os.Build;

import android.os.Handler;

import android.os.Message;

import android.os.Process;
@@ -84,7 +82,6 @@ import java.util.function.ObjIntConsumer; 
/**

 * Utility class to track stats log and emit corresponding app events

 */

@TargetApi(Build.VERSION_CODES.R)

public class AppEventProducer implements StatsLogConsumer {



    private static final int MSG_LAUNCH = 0;

quickstep/src/com/android/launcher3/model/WellbeingModel.java

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.content.ContentResolver.SCHEME_CONTENT; 


import static com.android.launcher3.util.SimpleBroadcastReceiver.getPackageFilter;



import android.annotation.TargetApi;

import android.app.RemoteAction;

import android.content.ContentProviderClient;

import android.content.ContentResolver;
@@ -30,7 +29,6 @@ import android.content.IntentFilter; 
import android.content.pm.LauncherApps;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.DeadObjectException;

import android.os.Handler;
@@ -63,7 +61,6 @@ import java.util.Map; 
/**

 * Data model for digital wellbeing status of apps.

 */

@TargetApi(Build.VERSION_CODES.Q)

public final class WellbeingModel extends BgObjectWithLooper {

    private static final String TAG = "WellbeingModel";

    private static final int[] RETRY_TIMES_MS = {5000, 15000, 30000};