Commit f3882b5b authored by Sophey Dong's avatar Sophey Dong Committed by Commit Bot

[SharingHub] Change title for Screenshots preview (not from editor).

Screenshot: http://dr/file/d/1h746Ii3uaCombcXItnabwo-BQ6N7TSrv/view

Bug: 1124799, 1120093
Change-Id: I669745db424fd55b2453fe6def3aa6a72a1c9c51
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2414922Reviewed-by: default avatarTanya Gupta <tgupta@chromium.org>
Commit-Queue: Sophey Dong <sophey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807922}
parent ee15e47d
...@@ -9,6 +9,7 @@ import android.graphics.Bitmap; ...@@ -9,6 +9,7 @@ import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.share.ChromeShareExtras; import org.chromium.chrome.browser.share.ChromeShareExtras;
import org.chromium.chrome.browser.share.screenshot.ScreenshotShareSheetViewProperties.NoArgOperation; import org.chromium.chrome.browser.share.screenshot.ScreenshotShareSheetViewProperties.NoArgOperation;
import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback; import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback;
...@@ -18,14 +19,19 @@ import org.chromium.components.browser_ui.share.ShareParams; ...@@ -18,14 +19,19 @@ import org.chromium.components.browser_ui.share.ShareParams;
import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModel;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.Locale;
/** /**
* ScreenshotShareSheetMediator is in charge of calculating and setting values for * ScreenshotShareSheetMediator is in charge of calculating and setting values for
* ScreenshotShareSheetViewProperties. * ScreenshotShareSheetViewProperties.
*/ */
class ScreenshotShareSheetMediator { class ScreenshotShareSheetMediator {
private static final String sIsoDateFormat = "yyyy-MM-dd";
private final PropertyModel mModel; private final PropertyModel mModel;
private final Context mContext; private final Context mContext;
private final Runnable mSaveRunnable; private final Runnable mSaveRunnable;
...@@ -89,8 +95,9 @@ class ScreenshotShareSheetMediator { ...@@ -89,8 +95,9 @@ class ScreenshotShareSheetMediator {
Bitmap bitmap = mModel.get(ScreenshotShareSheetViewProperties.SCREENSHOT_BITMAP); Bitmap bitmap = mModel.get(ScreenshotShareSheetViewProperties.SCREENSHOT_BITMAP);
WindowAndroid window = mTab.getWindowAndroid(); WindowAndroid window = mTab.getWindowAndroid();
// TODO(1124799): Change title to screenshot title. String isoDate = new SimpleDateFormat(sIsoDateFormat, Locale.getDefault())
String title = mTab.getTitle(); .format(new Date(System.currentTimeMillis()));
String title = mContext.getString(R.string.screenshot_title_for_share, isoDate);
Callback<Uri> callback = (bitmapUri) -> { Callback<Uri> callback = (bitmapUri) -> {
ShareParams params = ShareParams params =
new ShareParams.Builder(window, title, /*url=*/"") new ShareParams.Builder(window, title, /*url=*/"")
......
...@@ -3902,6 +3902,10 @@ Cookies and other data may be used across open Incognito tabs. ...@@ -3902,6 +3902,10 @@ Cookies and other data may be used across open Incognito tabs.
Share Share
</message> </message>
<message name="IDS_SCREENSHOT_TITLE_FOR_SHARE" desc="The title shared with the screenshot.">
Screenshot <ph name="CURRENT_DATE_ISO">%1$s<ex>2020-09-16</ex></ph>
</message>
<message name="IDS_SCREENSHOT_FILENAME_PREFIX" desc="File name prefix for downloaded screenshot that is followed by timestamp."> <message name="IDS_SCREENSHOT_FILENAME_PREFIX" desc="File name prefix for downloaded screenshot that is followed by timestamp.">
chrome_screenshot_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph> chrome_screenshot_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph>
</message> </message>
......
a4a9576afc3d56627286fe82a96156777baee6e5
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment