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

Commit bd77531b authored by Svet Ganov's avatar Svet Ganov
Browse files

Handle back button in grant permissions activity

bug:21760616

Change-Id: Ie559e5ff3de93c8354e9e1b0a857ccfca228ebc0
parent f101f467
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
import android.util.ArrayMap;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Window;
import android.view.WindowManager;

@@ -224,6 +225,26 @@ public class GrantPermissionsActivity extends Activity
        }
    }


    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event) {
        if (keyCode == KeyEvent.KEYCODE_BACK) {
            event.startTracking();
            return true;
        }
        return super.onKeyDown(keyCode, event);
    }

    @Override
    public boolean onKeyUp(int keyCode, KeyEvent event) {
        if (keyCode == KeyEvent.KEYCODE_BACK
                && event.isTracking() && !event.isCanceled()) {
            setResultAndFinish();
            return true;
        }
        return super.onKeyUp(keyCode, event);
    }

    private int computePermissionGrantState(PackageInfo callingPackageInfo,
            String permission, int permissionPolicy) {
        boolean permissionRequested = false;