Rename some fields in InputMethodSettings.

VK and PK are abbreviations which are ambiguous to readers outside our
team, so rename them with full words.

Rename zhuyinSelectionKeys to zhuyinSelectKeys to match the code in
google3.

Rearrange the sequence of properties, move all non-language-specific
options to top and sort them alphabetically.

InputMethodSettings have not been used in production code, so it is safe
to rename these properties.

Bug: 1060906
Change-Id: Idcf8eedcb1f7c3ee7d97f894599753a35fcd9179
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2114515Reviewed-by: Yuichiro Hanada <yhanada@chromium.org>
Commit-Queue: Jing Wang <jiwan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752611}

chrome/common/extensions/api/input_method_private.json

@@ -85,15 +85,16 @@
         "type": "object",
         "description": "User preference settings for a specific input method. Japanese input methods are not included because they are managed separately by Mozc module.",
         "properties": {
-          "autoCorrectionLevelPK": { "type": "integer", "optional": true, "description": "The level of auto correction for physical keyboard (0: Off, 1: Modest, 2: Aggressive)."},
-          "autoCorrectionLevelVK": { "type": "integer", "optional": true, "description": "The level of auto correction for virtual keyboard (0: Off, 1: Modest, 2: Aggressive)."},
-          "enableCapitalizationPK": { "type": "boolean", "optional": true, "description": "Whether to enable auto capitalization for physical keyboard."},
-          "enableCapitalizationVK": { "type": "boolean", "optional": true, "description": "Whether enable auto capitalization for virtual keyboard."},
           "enableCompletion": { "type": "boolean", "optional": true, "description": "Whether to enable auto completion."},
           "enableDoubleSpacePeriod": { "type": "boolean", "optional": true, "description": "Whether to auto transform double spaces to type period."},
           "enableGestureTyping": { "type": "boolean", "optional": true, "description": "Whether to enable gesture typing."},
           "enablePrediction": { "type": "boolean", "optional": true, "description": "Whether to enable word prediction."},
           "enableSoundOnKeypress": { "type": "boolean", "optional": true, "description": "Whether to enable sound on keypress."},
+          "physicalKeyboardAutoCorrectionLevel": { "type": "integer", "optional": true, "description": "The level of auto correction for physical keyboard (0: Off, 1: Modest, 2: Aggressive)."},
+          "physicalKeyboardEnableCapitalization": { "type": "boolean", "optional": true, "description": "Whether to enable auto capitalization for physical keyboard."},
+          "virtualKeyboardAutoCorrectionLevel": { "type": "integer", "optional": true, "description": "The level of auto correction for virtual keyboard (0: Off, 1: Modest, 2: Aggressive)."},
+          "virtualKeyboardEnableCapitalization": { "type": "boolean", "optional": true, "description": "Whether enable auto capitalization for virtual keyboard."},
+          "xkbLayout": { "type": "string", "optional": true, "description": "The xkb keyboard (system provided keyboard) layout."},
           "koreanEnableSyllableInput": { "type": "boolean", "optional": true, "description": "Whether input one syllable at a time in korean input method."},
           "koreanKeyboardLayout": { "type": "string", "optional": true, "description": "The layout of korean keyboard."},
           "koreanShowHangulCandidate": { "type": "boolean", "optional": true, "description": "Whether to show hangul candidates in korean input method."},
@@ -126,10 +127,9 @@
               "z_zh": {"type": "boolean", "optional": true, "description": "Whether to enable z_zh fuzzy"}
             }
           },
-          "xkbLayout": { "type": "string", "optional": true, "description": "The xkb keyboard (system provided keyboard) layout."},
           "zhuyinKeyboardLayout": { "type": "string", "optional": true, "description": "The layout of zhuyin keyboard."},
           "zhuyinPageSize": { "type": "integer", "optional": true, "description": "The page size of zhuyin candidate page."},
-          "zhuyinSelectionKeys": { "type": "string", "optional": true, "description": "The keys used to select candidates in zhuyin."}
+          "zhuyinSelectKeys": { "type": "string", "optional": true, "description": "The keys used to select candidates in zhuyin."}
         }
       }
     ],

third_party/closure_compiler/externs/input_method_private.js

@@ -114,15 +114,16 @@ chrome.inputMethodPrivate.InputContext;
 /**
  * User preference settings for a specific input method. Japanese input methods are not included because they are managed separately by Mozc module.
  * @typedef {{
- *   autoCorrectionLevelPK: (number|undefined),
- *   autoCorrectionLevelVK: (number|undefined),
- *   enableCapitalizationPK: (boolean|undefined),
- *   enableCapitalizationVK: (boolean|undefined),
  *   enableCompletion: (boolean|undefined),
  *   enableDoubleSpacePeriod: (boolean|undefined),
  *   enableGestureTyping: (boolean|undefined),
  *   enablePrediction: (boolean|undefined),
  *   enableSoundOnKeypress: (boolean|undefined),
+ *   physicalKeyboardAutoCorrectionLevel: (number|undefined),
+ *   physicalKeyboardEnableCapitalization: (boolean|undefined),
+ *   virtualKeyboardAutoCorrectionLevel: (number|undefined),
+ *   virtualKeyboardEnableCapitalization: (boolean|undefined),
+ *   xkbLayout: (string|undefined),
  *   koreanEnableSyllableInput: (boolean|undefined),
  *   koreanKeyboardLayout: (string|undefined),
  *   koreanShowHangulCandidate: (boolean|undefined),
@@ -146,10 +147,9 @@ chrome.inputMethodPrivate.InputContext;
  *     uan_uang: (boolean|undefined),
  *     z_zh: (boolean|undefined)
  *   }|undefined),
- *   xkbLayout: (string|undefined),
  *   zhuyinKeyboardLayout: (string|undefined),
  *   zhuyinPageSize: (number|undefined),
- *   zhuyinSelectionKeys: (string|undefined)
+ *   zhuyinSelectKeys: (string|undefined)
  * }}
  */
 chrome.inputMethodPrivate.InputMethodSettings;