Merge "Using the filename as the media title for screenshots and changing filename...

diff --cc packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index 02a955b,73f559b..3e037c1
--- 1/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
--- 2/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@@ -87,14 -88,14 +88,14 @@@ class SaveImageInBackgroundTask extend
          Context context = params[0].context;
          Bitmap image = params[0].image;
  
 -        try{
 +        try {
              long currentTime = System.currentTimeMillis();
-             String date = new SimpleDateFormat("MM-dd-yy-kk-mm-ss").format(new Date(currentTime));
+             String date = new SimpleDateFormat("yyyy-MM-dd-kk-mm-ss").format(new Date(currentTime));
              String imageDir = Environment.getExternalStoragePublicDirectory(
                      Environment.DIRECTORY_PICTURES).getAbsolutePath();
-             String imageFilePath = String.format(SCREENSHOT_FILE_PATH_TEMPLATE,
-                     imageDir, SCREENSHOTS_DIR_NAME,
-                     date, currentTime % 1000);
+             String imageFileName = String.format(SCREENSHOT_FILE_NAME_TEMPLATE, date);
+             String imageFilePath = String.format(SCREENSHOT_FILE_PATH_TEMPLATE, imageDir,
+                     SCREENSHOTS_DIR_NAME, imageFileName);
  
              // Save the screenshot to the MediaStore
              ContentValues values = new ContentValues();