Merge "GlobalActions: make silent mode the last toggle" into jellybean (5b304659) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -298,11 +298,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
	// next: airplane mode		// next: airplane mode
	mItems.add(mAirplaneModeOn);		mItems.add(mAirplaneModeOn);

	// last: silent mode		// next: users
	if (SHOW_SILENT_TOGGLE) {
	mItems.add(mSilentModeAction);
	}

	List<UserInfo> users = mContext.getPackageManager().getUsers();		List<UserInfo> users = mContext.getPackageManager().getUsers();
	if (users.size() > 1) {		if (users.size() > 1) {
	UserInfo currentUser;		UserInfo currentUser;
	@@ -339,6 +335,11 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
	}		}
	}		}

			// last: silent mode
			if (SHOW_SILENT_TOGGLE) {
			mItems.add(mSilentModeAction);
			}

	mAdapter = new MyAdapter();		mAdapter = new MyAdapter();

	final AlertDialog.Builder ab = new AlertDialog.Builder(mContext);		final AlertDialog.Builder ab = new AlertDialog.Builder(mContext);