Merge "Remove logspam from GlobalActions." into lmp-dev (82ed96a1) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/GlobalActions.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -272,15 +272,19 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		mItems.add(new PowerAction());
		} else if (GLOBAL_ACTION_KEY_AIRPLANE.equals(actionKey)) {
		mItems.add(mAirplaneModeOn);
		} else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey)
		&& (Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner())) {
		} else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey)) {
		if (Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner()) {
		mItems.add(getBugReportAction());
		} else if (GLOBAL_ACTION_KEY_SILENT.equals(actionKey) && mShowSilentToggle) {
		}
		} else if (GLOBAL_ACTION_KEY_SILENT.equals(actionKey)) {
		if (mShowSilentToggle) {
		mItems.add(mSilentModeAction);
		} else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)
		&& SystemProperties.getBoolean("fw.power_user_switcher", false)) {
		}
		} else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)) {
		if (SystemProperties.getBoolean("fw.power_user_switcher", false)) {
		addUsersToMenu(mItems);
		}
		} else if (GLOBAL_ACTION_KEY_SETTINGS.equals(actionKey)) {
		mItems.add(getSettingsAction());
		} else if (GLOBAL_ACTION_KEY_LOCKDOWN.equals(actionKey)) {