diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-30 11:52:28 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-30 11:52:28 -0800 |
| commit | ecb483620b8208aa95ba663b866852a483ccb8d7 (patch) | |
| tree | 2d0540c2e698e652e5fd7d353342e19eed3c289e | |
| parent | 9140fea09cff9bf7141f12b7464aefa576f5474b (diff) | |
| parent | 81d10a1b724289c3a477b305f7618a888a35932a (diff) | |
| download | android_packages_apps_Gallery2-ecb483620b8208aa95ba663b866852a483ccb8d7.tar.gz android_packages_apps_Gallery2-ecb483620b8208aa95ba663b866852a483ccb8d7.tar.bz2 android_packages_apps_Gallery2-ecb483620b8208aa95ba663b866852a483ccb8d7.zip | |
Merge "Gallery2: "share via" page don't translate after changing language"
| -rwxr-xr-x | res/values-zh-rCN/strings.xml | 1 | ||||
| -rwxr-xr-x | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 1a218ad8b..ce3518de0 100755 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -48,6 +48,7 @@ <string name="set_image" msgid="2331476809308010401">"将照片设置为"</string> <string name="set_wallpaper" msgid="8491121226190175017">"设置壁纸"</string> <string name="wallpaper" msgid="140165383777262070">"正在设置壁纸..."</string> + <string name="share_dialogue_title">分享选择</string> <string name="camera_setas_wallpaper" msgid="797463183863414289">"壁纸"</string> <string name="cannot_share_items">分享选择条目最大值为300</string> <string name="delete" msgid="2839695998251824487">"删除"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1fe30b3fe..977475f24 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -119,6 +119,7 @@ <string name="confirm">Confirm</string> <string name="cancel">Cancel</string> <string name="share">Share</string> + <string name="share_dialogue_title">Share via</string> <string name="share_panorama">Share panorama</string> <string name="share_as_photo">Share as photo</string> diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index fb39257b6..b11dadcc2 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -673,8 +673,10 @@ public abstract class PhotoPage extends ActivityState implements mShareIntent.setType(MenuExecutor.getMimeType(mModel .getMediaItem(0).getMediaType())); mShareIntent.putExtra(Intent.EXTRA_STREAM, uri); + String shareTitle = mActivity.getResources(). + getString(R.string.share_dialogue_title); mActivity.startActivity(Intent.createChooser(mShareIntent, - "Share via")); + shareTitle)); } return; |