Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev

am: 65515931e9

* commit '65515931e98341e17cf6207b363dbe3f4399fcfd':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: Ie9fae7049d30f7812dfde400b65800e2f36e8e9b
This commit is contained in:
Mihai Nita
2016-04-22 14:49:53 +00:00
committed by android-build-merger
6 changed files with 197 additions and 10 deletions

View File

@@ -24,4 +24,11 @@
<item type="id" name="lock_password" />
<item type="id" name="encrypt_dont_require_password" />
<!-- Used for custom accessibility actions in the Drag-and-Drop locale list -->
<item type="id" name="action_drag_move_up" />
<item type="id" name="action_drag_move_down" />
<item type="id" name="action_drag_move_top" />
<item type="id" name="action_drag_move_bottom" />
<item type="id" name="action_drag_remove" />
</resources>

View File

@@ -530,6 +530,17 @@
<!-- This text shows in the language picker when the system is not translated into that languages [CHAR LIMIT=80] -->
<string name="locale_not_translated">May not be available in some apps</string>
<!-- Label for an accessibility action that moves a language up in the ordered language list [CHAR LIMIT=20] -->
<string name="action_drag_label_move_up">Move up</string>
<!-- Label for an accessibility action that moves a language down in the ordered language list [CHAR LIMIT=20] -->
<string name="action_drag_label_move_down">Move down</string>
<!-- Label for an accessibility action that moves a language to the top of the ordered language list [CHAR LIMIT=20] -->
<string name="action_drag_label_move_top">Move to top</string>
<!-- Label for an accessibility action that moves a language to the bottom of the ordered language list [CHAR LIMIT=20] -->
<string name="action_drag_label_move_bottom">Move to bottom</string>
<!-- Label for an accessibility action that removes the currently selected language from the the ordered language list [CHAR LIMIT=20] -->
<string name="action_drag_label_remove">Remove language</string>
<!-- The title of the dialog to pick an activity. This is shown when there are multiple activities that can do a particular action. For example, suppose you click on the "Share" menu item in the Browser. Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc. This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
<string name="activity_picker_label">Choose activity</string>
<!-- Do not translate. -->