Profiles: Fix global action for profile (69c69a9c) · Commits · e / os / android_frameworks_base

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

+26 −28

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		private static final String GLOBAL_ACTION_KEY_USERS = "users";
		private static final String GLOBAL_ACTION_KEY_SETTINGS = "settings";
		private static final String GLOBAL_ACTION_KEY_LOCKDOWN = "lockdown";
		private static final String GLOBAL_ACTION_KEY_PROFILE = "profile";

		private final Context mContext;
		private final WindowManagerFuncs mWindowManagerFuncs;
		@@ -301,14 +302,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		mItems.add(getSettingsAction());
		} else if (GLOBAL_ACTION_KEY_LOCKDOWN.equals(actionKey)) {
		mItems.add(getLockdownAction());
		} else {
		Log.e(TAG, "Invalid global action key " + actionKey);
		}
		// Add here so we don't add more than one.
		addedKeys.add(actionKey);
		}

		// next: profile
		} else if (GLOBAL_ACTION_KEY_PROFILE.equals(actionKey)) {
		mItems.add(
		new ProfileChooseAction() {
		public void onPress() {
		@@ -332,6 +326,12 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		}

		});
		} else {
		Log.e(TAG, "Invalid global action key " + actionKey);
		}
		// Add here so we don't add more than one.
		addedKeys.add(actionKey);
		}

		mAdapter = new MyAdapter();

		@@ -427,9 +427,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		abstract public void onPress();

		public View create(Context context, View convertView, ViewGroup parent, LayoutInflater inflater) {
		View v = (convertView != null) ?
		convertView :
		inflater.inflate(R.layout.global_actions_item, parent, false);
		View v = inflater.inflate(R.layout.global_actions_item, parent, false);

		ImageView icon = (ImageView) v.findViewById(R.id.icon);
		TextView messageView = (TextView) v.findViewById(R.id.message);