diff options
author | Ray Chen <raychen@google.com> | 2011-11-03 10:22:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-03 10:22:36 +0000 |
commit | cb0b8f974fb97582b0b37458ec599226b5fb8f92 (patch) | |
tree | 010baf43c2f50b0b4816566c3bbf23713d088932 /res | |
parent | e2f9aaf5fa564decd9ad9a1e95ac48c6d9e5d447 (diff) | |
parent | da9f0c773aa6c9ba228f30811df35d2c601dfdb6 (diff) | |
download | android_packages_apps_Gallery2-cb0b8f974fb97582b0b37458ec599226b5fb8f92.tar.gz android_packages_apps_Gallery2-cb0b8f974fb97582b0b37458ec599226b5fb8f92.tar.bz2 android_packages_apps_Gallery2-cb0b8f974fb97582b0b37458ec599226b5fb8f92.zip |
am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
* commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6':
Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/choose_widget_type.xml | 8 | ||||
-rw-r--r-- | res/values/strings.xml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/res/layout/choose_widget_type.xml b/res/layout/choose_widget_type.xml index 7da8dd157..5f1739ad3 100644 --- a/res/layout/choose_widget_type.xml +++ b/res/layout/choose_widget_type.xml @@ -27,18 +27,18 @@ android:layout_weight="1" android:minHeight="48dp" android:text="@string/widget_type_album"/> - <RadioButton android:id="@+id/widget_type_shuffle" + <RadioButton android:id="@+id/widget_type_photo" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:minHeight="48dp" - android:text="@string/widget_type_shuffle"/> - <RadioButton android:id="@+id/widget_type_photo" + android:text="@string/widget_type_photo"/> + <RadioButton android:id="@+id/widget_type_shuffle" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:minHeight="48dp" - android:text="@string/widget_type_photo"/> + android:text="@string/widget_type_shuffle"/> <View android:layout_width="match_parent" android:layout_height="1dp" android:layout_weight="0" diff --git a/res/values/strings.xml b/res/values/strings.xml index fb475b20b..c498d9e75 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -75,11 +75,11 @@ <!-- Title prompted for user to choose a video item [CHAR LIMIT=20] --> <string name="select_video">Select video</string> <!-- Title prompted for user to choose a media object [CHAR LIMIT=20] --> - <string name="select_item">Select item(s)</string> + <string name="select_item">Select item</string> <!-- Title prompted for user to choose an album [CHAR LIMIT=20] --> - <string name="select_album">Select album(s)</string> + <string name="select_album">Select album</string> <!-- Title prompted for user to choose a group [CHAR LIMIT=20] --> - <string name="select_group">Select group(s)</string> + <string name="select_group">Select group</string> <!-- Displayed in the title of the dialog for things to do with a picture that is to be "set as" (e.g. set as contact photo or set as wallpaper) --> @@ -380,14 +380,14 @@ <string name="click_import">Touch here to import</string> <!-- The label on the radio button for the widget type that shows the images randomly. [CHAR LIMIT=30]--> - <string name="widget_type_album">Images from an album</string> + <string name="widget_type_album">Choose an album</string> <!-- The label on the radio button for the widget type that shows the images in an album. [CHAR LIMIT=30]--> <string name="widget_type_shuffle">Shuffle all images</string> <!-- The label on the radio button for the widget type that shows only one image. [CHAR LIMIT=30]--> <string name="widget_type_photo">Choose an image</string> <!-- The title of the dialog for choosing the type of widget. [CHAR LIMIT=20] --> - <string name="widget_type">Widget type</string> + <string name="widget_type">Choose images</string> <!-- Title of the Android Dreams slideshow screensaver. [CHAR LIMIT=20] --> <string name="slideshow_dream_name">Slideshow</string> |