Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d8e26a authored by Evan Severson's avatar Evan Severson Committed by android-build-merger
Browse files

Merge "Foreground permission request UI similar to tristate" into qt-dev 

am: 521e7806

Change-Id: I4e3515f884be234523078ea5039b60353b391d79
parents dd030ce7 521e7806

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+8 −3
Original line number Diff line number Diff line
@@ -653,12 +653,17 @@ public class GrantPermissionsActivity extends Activity 
                if (needForegroundPermission) {

                    messageId = groupState.mGroup.getRequest();



                    if (needBackgroundPermission) {

                    if (groupState.mGroup.hasPermissionWithBackgroundMode()) {

                        buttonLabels[LABEL_ALLOW_BUTTON] = null;

                        buttonLabels[LABEL_ALLOW_ALWAYS_BUTTON] =

                                getString(R.string.grant_dialog_button_allow_always);

                        buttonLabels[LABEL_ALLOW_FOREGROUND_BUTTON] =

                                getString(R.string.grant_dialog_button_allow_foreground);

                        if (needBackgroundPermission) {

                            buttonLabels[LABEL_ALLOW_ALWAYS_BUTTON] =

                                    getString(R.string.grant_dialog_button_allow_always);

                            if (isForegroundPermissionUserSet || isBackgroundPermissionUserSet) {

                                buttonLabels[LABEL_DENY_BUTTON] = null;

                            }

                        }

                    } else {

                        detailMessageId = groupState.mGroup.getRequestDetail();

                    }