GlobalActions: Always add power off option to power menu (f768e862) · Commits · e / os / android_frameworks_base

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

100755 → 100644

+4 −1

Original line number	Diff line number	Diff line
		@@ -294,6 +294,9 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		actionsArray = mActions.split("\\\|");
		}

		// Always add the power off option
		mItems.add(new PowerAction());

		ArraySet<String> addedKeys = new ArraySet<String>();
		for (int i = 0; i < actionsArray.length; i++) {
		String actionKey = actionsArray[i];
		@@ -302,7 +305,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		continue;
		}
		if (GLOBAL_ACTION_KEY_POWER.equals(actionKey)) {
		mItems.add(new PowerAction());
		continue;
		} else if (GLOBAL_ACTION_KEY_REBOOT.equals(actionKey)) {
		mItems.add(new RebootAction());
		} else if (GLOBAL_ACTION_KEY_SCREENSHOT.equals(actionKey)) {