Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev

am: 1308bd8

* commit '1308bd8bb1f1223c57a867246542ec22d7f9ef53':
  Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035

Change-Id: I73c5c49f685670b7a5f91c46dde0ac693f1d5fa2
This commit is contained in:
Noah Wang
2016-03-30 20:06:33 +00:00
committed by android-build-merger
2 changed files with 4 additions and 1 deletions

View File

@@ -28,7 +28,8 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?android:attr/colorBackgroundFloating" />
android:background="?android:attr/colorBackgroundFloating"
android:contentDescription="@string/preview_pager_content_description" />
<TextView
android:layout_width="match_parent"

View File

@@ -147,6 +147,8 @@
<!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
<string name="sdcard_format" product="default">Erase SD card</string>
<!-- Content description for preview pager. [CHAR LIMIT=NONE] -->
<string name="preview_pager_content_description">Preview</string>
<!-- Content description for dot pager indicator for preview pager. [CHAR LIMIT=NONE] -->
<string name="preview_page_indicator_content_description">Preview, page <xliff:g id="current_page" example="3">%1$d</xliff:g> of <xliff:g id="num_pages" example="9">%2$d</xliff:g></string>