Merge changes Ieea9a13a,Id2ae6151 into nyc-dev

am: 5ffbf2e

* commit '5ffbf2e39d8ce5bb4f1256564fe060534541c710':
  Remove gear icon from InputMethodPreference.
  Update title to "Add or edit virtual keyboards".

Change-Id: Ideeeb1062a62ed77a7d178c80469effa0c3ade7c
This commit is contained in:
Yohei Yukawa
2016-03-31 06:21:39 +00:00
committed by android-build-merger
2 changed files with 6 additions and 6 deletions

View File

@@ -3616,8 +3616,8 @@
<string name="virtual_keyboard_category">Virtual keyboard</string>
<!-- Title for the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
<string name="available_virtual_keyboard_category">Available virtual keyboard</string>
<!-- Title for the button to trigger the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
<string name="add_virtual_keyboard">Add a virtual keyboard</string>
<!-- Title for the button to trigger the 'Add or edit virtual keyboards' preference sub-screen. [CHAR LIMIT=35] -->
<string name="add_virtual_keyboard">Add or edit virtual keyboards</string>
<!-- Title for the 'keyboard assistance' preference category. [CHAR LIMIT=35] -->
<string name="keyboard_assistance_category">Keyboard assistance</string>
<!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] -->