Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7fb64c6e: Merge "more locale-appropriate screenshot share text"

Browse Source 
* commit '7fb64c6e6c3360a61a8c726d0edbda3a20c037ac':
  more locale-appropriate screenshot share text
This commit is contained in:
Elliott Hughes
2013-10-01 14:33:30 -07:00
committed by Android Git Automerger
parent 591e8ae307 7fb64c6e6c
commit ad8ec14f85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -61,6 +61,7 @@ import com.android.systemui.R;
import java.io.File; import java.io.File;
import java.io.OutputStream; import java.io.OutputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@@ -211,8 +212,7 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi
values.put(MediaStore.Images.ImageColumns.HEIGHT, mImageHeight); values.put(MediaStore.Images.ImageColumns.HEIGHT, mImageHeight);
Uri uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values); Uri uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
String subjectDate = new SimpleDateFormat("hh:mma, MMM dd, yyyy") String subjectDate = DateFormat.getDateTimeInstance().format(new Date(mImageTime));
.format(new Date(mImageTime));
String subject = String.format(SCREENSHOT_SHARE_SUBJECT_TEMPLATE, subjectDate); String subject = String.format(SCREENSHOT_SHARE_SUBJECT_TEMPLATE, subjectDate);
Intent sharingIntent = new Intent(Intent.ACTION_SEND); Intent sharingIntent = new Intent(Intent.ACTION_SEND);
sharingIntent.setType("image/png"); sharingIntent.setType("image/png");