Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove managed profile toast" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-22 15:19:20 +00:00
committed by Android (Google) Code Review
parent a063da83f1 c9afb8ba06
commit 7f4e9739e4
3 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -764,9 +764,6 @@
<dimen name="volume_expander_margin_end">2dp</dimen>
<dimen name="volume_expander_margin_top">6dp</dimen>
<!-- Padding between icon and text for managed profile toast -->
<dimen name="managed_profile_toast_padding">4dp</dimen>
<!-- Thickness of the assist disclosure beams -->
<dimen name="assist_disclosure_thickness">2.5dp</dimen>

3
packages/SystemUI/res/values/strings.xml
View File

@@ -1326,9 +1326,6 @@
<!-- Hide quick settings tile confirmation button -->
<string name="quick_settings_reset_confirmation_button">Hide</string>
<!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
<string name="managed_profile_foreground_toast">You\'re using your work profile</string>
<!-- volume stream names. All nouns. -->
<string name="stream_voice_call">Call</string> <!-- STREAM_VOICE_CALL -->
<string name="stream_system">System</string> <!-- STREAM_SYSTEM -->

24
packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java
View File

@@ -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;
}