Commit e6a80af1 authored by Andrew Swan's avatar Andrew Swan
Browse files

Bug 1398327 Part 1: Skip permission dialog access keys on Android r=zombie 

MozReview-Commit-ID: 1rbludpEmdm

--HG--
extra : rebase_source : f38968efda8d0a90c91036607893e4576e73d7ef
parent 17b5da90

mobile/android/locales/en-US/chrome/browser.properties

+0 −2
Original line number Diff line number Diff line
@@ -122,9 +122,7 @@ webextPerms.header=Add %S? 
# by the webextension.

webextPerms.listIntro=It requires your permission to:

webextPerms.add.label=Add

webextPerms.add.accessKey=A

webextPerms.cancel.label=Cancel

webextPerms.cancel.accessKey=C



webextPerms.description.bookmarks=Read and modify bookmarks

webextPerms.description.browserSettings=Read and modify browser settings

toolkit/components/extensions/Extension.jsm

+17 −7
Original line number Diff line number Diff line
@@ -904,15 +904,19 @@ this.ExtensionData = class { 
      }

    }



    const haveAccessKeys = (AppConstants.platform !== "android");



    result.header = bundle.formatStringFromName("webextPerms.header", [info.addonName], 1);

    result.text = info.unsigned ?

                  bundle.GetStringFromName("webextPerms.unsignedWarning") : "";

    result.listIntro = bundle.GetStringFromName("webextPerms.listIntro");



    result.acceptText = bundle.GetStringFromName("webextPerms.add.label");

    result.acceptKey = bundle.GetStringFromName("webextPerms.add.accessKey");

    result.cancelText = bundle.GetStringFromName("webextPerms.cancel.label");

    if (haveAccessKeys) {

      result.acceptKey = bundle.GetStringFromName("webextPerms.add.accessKey");

      result.cancelKey = bundle.GetStringFromName("webextPerms.cancel.accessKey");

    }



    if (info.type == "sideload") {

      result.header = bundle.formatStringFromName("webextPerms.sideloadHeader", [info.addonName], 1);
@@ -920,23 +924,29 @@ this.ExtensionData = class { 
                "webextPerms.sideloadTextNoPerms" : "webextPerms.sideloadText2";

      result.text = bundle.GetStringFromName(key);

      result.acceptText = bundle.GetStringFromName("webextPerms.sideloadEnable.label");

      result.acceptKey = bundle.GetStringFromName("webextPerms.sideloadEnable.accessKey");

      result.cancelText = bundle.GetStringFromName("webextPerms.sideloadCancel.label");

      if (haveAccessKeys) {

        result.acceptKey = bundle.GetStringFromName("webextPerms.sideloadEnable.accessKey");

        result.cancelKey = bundle.GetStringFromName("webextPerms.sideloadCancel.accessKey");

      }

    } else if (info.type == "update") {

      result.header = "";

      result.text = bundle.formatStringFromName("webextPerms.updateText", [info.addonName], 1);

      result.acceptText = bundle.GetStringFromName("webextPerms.updateAccept.label");

      if (haveAccessKeys) {

        result.acceptKey = bundle.GetStringFromName("webextPerms.updateAccept.accessKey");

      }

    } else if (info.type == "optional") {

      result.header = bundle.formatStringFromName("webextPerms.optionalPermsHeader", [info.addonName], 1);

      result.text = "";

      result.listIntro = bundle.GetStringFromName("webextPerms.optionalPermsListIntro");

      result.acceptText = bundle.GetStringFromName("webextPerms.optionalPermsAllow.label");

      result.acceptKey = bundle.GetStringFromName("webextPerms.optionalPermsAllow.accessKey");

      result.cancelText = bundle.GetStringFromName("webextPerms.optionalPermsDeny.label");

      if (haveAccessKeys) {

        result.acceptKey = bundle.GetStringFromName("webextPerms.optionalPermsAllow.accessKey");

        result.cancelKey = bundle.GetStringFromName("webextPerms.optionalPermsDeny.accessKey");

      }

    }



    return result;

  }