diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 3b58b7249b05e..34d71da2c0173 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -764,9 +764,6 @@ 2dp 6dp - - 4dp - 2.5dp diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index edf56afad714d..18f378e5919b1 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1326,9 +1326,6 @@ Hide - - You\'re using your work profile - Call System diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java index 1287ced8594c4..25684ff651fdb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java @@ -108,16 +108,6 @@ public class NotificationLockscreenUserManager implements Dumpable { } else if (Intent.ACTION_USER_UNLOCKED.equals(action)) { // Start the overview connection to the launcher service Dependency.get(OverviewProxyService.class).startConnectionToCurrentUser(); - } else if (Intent.ACTION_USER_PRESENT.equals(action)) { - try { - final int lastResumedActivityUserId = - ActivityManager.getService().getLastResumedActivityUserId(); - if (mUserManager.isManagedProfile(lastResumedActivityUserId)) { - showForegroundManagedProfileActivityToast(); - } - } catch (RemoteException e) { - // Abandon hope activity manager not running. - } } else if (NOTIFICATION_UNLOCKED_BY_WORK_CHALLENGE_ACTION.equals(action)) { final IntentSender intentSender = intent.getParcelableExtra(Intent.EXTRA_INTENT); final String notificationKey = intent.getStringExtra(Intent.EXTRA_INDEX); @@ -224,7 +214,6 @@ public class NotificationLockscreenUserManager implements Dumpable { IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_USER_SWITCHED); filter.addAction(Intent.ACTION_USER_ADDED); - filter.addAction(Intent.ACTION_USER_PRESENT); filter.addAction(Intent.ACTION_USER_UNLOCKED); mContext.registerReceiver(mBaseBroadcastReceiver, filter); @@ -237,19 +226,6 @@ public class NotificationLockscreenUserManager implements Dumpable { mSettingsObserver.onChange(false); // set up } - private void showForegroundManagedProfileActivityToast() { - Toast toast = Toast.makeText(mContext, - R.string.managed_profile_foreground_toast, - Toast.LENGTH_SHORT); - TextView text = toast.getView().findViewById(android.R.id.message); - text.setCompoundDrawablesRelativeWithIntrinsicBounds( - R.drawable.stat_sys_managed_profile_status, 0, 0, 0); - int paddingPx = mContext.getResources().getDimensionPixelSize( - R.dimen.managed_profile_toast_padding); - text.setCompoundDrawablePadding(paddingPx); - toast.show(); - } - public boolean shouldShowLockscreenNotifications() { return mShowLockscreenNotifications; }