OSDN Git Service

Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
authorJason Monk <jmonk@google.com>
Wed, 6 Apr 2016 13:31:44 +0000 (13:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 13:31:44 +0000 (13:31 +0000)
am: 51970c8

* commit '51970c855812232a9514958dd67959f18749fbe1':
  Add dev options to set swXdp

Change-Id: Id25b198c9af3e7b6eca478c3936341096d5edd2e

1  2 
res/values/strings.xml

      <string name="notification_suggestion_title">Control lock screen notifications</string>
      <!-- Summary of notification suggestion during optional steps of setup. [CHAR_LIMIT=80] -->
      <string name="notification_suggestion_summary">Show or hide notification content</string>
 +    <!-- Setting tab title for general status. [CHAR LIMIT=20] -->
 +    <string name="page_tab_title_status">Status</string>
 +    <!-- Setting tab title for all setting options. [CHAR LIMIT=20] -->
 +    <string name="page_tab_title_summary">All</string>
  
+     <!-- Summary of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
+     <string name="developer_density_summary"><xliff:g name="count" example="320">%d</xliff:g> dp</string>
+     <!-- Title of developer options to set the smallest width of the screen [CHAR LIMIT=60]-->
+     <string name="developer_smallest_width">Smallest width</string>
  </resources>