Merge "CentralSurfaces - remove old code" into main (4c8d86bd) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+0 −36

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import static com.android.systemui.Flags.relockWithPowerButtonImmediately;
		import static com.android.systemui.Flags.statusBarSignalPolicyRefactor;
		import static com.android.systemui.charging.WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL;
		import static com.android.systemui.flags.Flags.SHORTCUT_LIST_SEARCH_LAYOUT;
		import static com.android.systemui.statusbar.NotificationLockscreenUserManager.PERMISSION_SELF;
		import static com.android.systemui.statusbar.StatusBarState.SHADE;

		import android.annotation.Nullable;
		@@ -41,7 +40,6 @@ import android.app.ActivityOptions;
		import android.app.IWallpaperManager;
		import android.app.KeyguardManager;
		import android.app.Notification;
		import android.app.NotificationManager;
		import android.app.PendingIntent;
		import android.app.StatusBarManager;
		import android.app.TaskInfo;
		@@ -275,11 +273,6 @@ import javax.inject.Provider;
		@SysUISingleton
		public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {

		private static final String BANNER_ACTION_CANCEL =
		"com.android.systemui.statusbar.banner_action_cancel";
		private static final String BANNER_ACTION_SETUP =
		"com.android.systemui.statusbar.banner_action_setup";

		private static final int MSG_LAUNCH_TRANSITION_TIMEOUT = 1003;
		// 1020-1040 reserved for BaseStatusBar

		@@ -963,12 +956,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		}
		}

		IntentFilter internalFilter = new IntentFilter();
		internalFilter.addAction(BANNER_ACTION_CANCEL);
		internalFilter.addAction(BANNER_ACTION_SETUP);
		mContext.registerReceiver(mBannerActionBroadcastReceiver, internalFilter, PERMISSION_SELF,
		null, Context.RECEIVER_EXPORTED_UNAUDITED);

		if (mWallpaperSupported) {
		IWallpaperManager wallpaperManager = IWallpaperManager.Stub.asInterface(
		ServiceManager.getService(Context.WALLPAPER_SERVICE));
		@@ -2948,29 +2935,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		return mDeviceInteractive;
		}

		private final BroadcastReceiver mBannerActionBroadcastReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();
		if (BANNER_ACTION_CANCEL.equals(action) \|\| BANNER_ACTION_SETUP.equals(action)) {
		NotificationManager noMan = (NotificationManager)
		mContext.getSystemService(Context.NOTIFICATION_SERVICE);
		noMan.cancel(com.android.internal.messages.nano.SystemMessageProto.SystemMessage.
		NOTE_HIDDEN_NOTIFICATIONS);

		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0);
		if (BANNER_ACTION_SETUP.equals(action)) {
		mShadeController.animateCollapseShadeForced();
		mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_REDACTION)
		.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

		);
		}
		}
		}
		};

		@Override
		public void handleExternalShadeWindowTouch(MotionEvent event) {
		getNotificationShadeWindowViewController().handleExternalTouch(event);