Merge "Modifying sample preview text for font size setting."

This commit is contained in:
Noah Wang
2016-01-14 17:48:26 +00:00
committed by Android (Google) Code Review
2 changed files with 18 additions and 4 deletions

View File

@@ -19,6 +19,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/font_size_preview_text_headline"
android:textAppearance="@android:style/TextAppearance.Material.Headline"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -28,7 +34,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/font_size_preview_text_subhead"
android:text="@string/font_size_preview_text_subtitle"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
<TextView

View File

@@ -161,9 +161,17 @@
<!-- Do not translate. label for font size preview. Does not need to be translated. -->
<string name="font_size_preview_text">Servez à ce monsieur une bière et des kiwis.</string>
<string name="font_size_preview_text_title" translatable="false">Twenty Thousand Leagues Under The Sea</string>
<string name="font_size_preview_text_subhead" translatable="false">Chapter 23: The Coral Kingdom</string>
<string name="font_size_preview_text_body" translatable="false">The next day I woke with my head singularly clear. To my great surprise, I was in my own room. My companions, no doubt, had been reinstated in their cabin, without having perceived it any more than I. Of what had passed during the night they were as ignorant as I was, and to penetrate this mystery I only reckoned upon the chances of the future.</string>
<string name="font_size_preview_text_headline">Sample text</string>
<string name="font_size_preview_text_title">Twenty Thousand Leagues Under The Sea</string>
<string name="font_size_preview_text_subtitle">Chapter 23: The Coral Kingdom</string>
<string name="font_size_preview_text_body">
The next day I woke with my head singularly clear. To my great surprise, I was in my own room. My companions,
no doubt, had been reinstated in their cabin, without having perceived it any more than I. Of what had passed
during the night they were as ignorant as I was, and to penetrate this mystery I only reckoned upon the chances
of the future.\nI then thought of quitting my room. Was I free again or a prisoner? Quite free. I opened the door,
went to the half deck, went up the central stairs. The panels, shut the evening before, were open. I went on to
the platform.\nNed Land and Conseil waited there for me. I questioned them; they knew nothing. Lost in a heavy
sleep in which they had been totally unconscious, they had been astonished at finding themselves in their cabin.</string>
<!-- Button. Chosen when they want to save the chosen text size. -->
<string name="font_size_save">OK</string>