Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa7d3d24 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Gallery2: Sort on modified date if taken date is not present

parent 16f5ac1c

src/com/android/gallery3d/data/LocalAlbum.java

+6 −4
Original line number Diff line number Diff line
@@ -69,8 +69,9 @@ public class LocalAlbum extends MediaSet { 


        if (isImage) {

            mWhereClause = ImageColumns.BUCKET_ID + " = ?";

            mOrderClause = ImageColumns.DATE_TAKEN + " DESC, "

                    + ImageColumns._ID + " DESC";

            mOrderClause = "CASE WHEN + " + ImageColumns.DATE_TAKEN + " != 0 THEN "

                    + ImageColumns.DATE_TAKEN + " ELSE (" + ImageColumns.DATE_MODIFIED

                    + " * 1000) END DESC, " + ImageColumns._ID + " DESC";

            mBaseUri = Images.Media.EXTERNAL_CONTENT_URI;

            mProjection = LocalImage.PROJECTION;

            mItemPath = LocalImage.ITEM_PATH;
@@ -80,8 +81,9 @@ public class LocalAlbum extends MediaSet { 
            } else {

            mWhereClause = VideoColumns.BUCKET_ID + " = ?";

            }

            mOrderClause = VideoColumns.DATE_TAKEN + " DESC, "

                    + VideoColumns._ID + " DESC";

            mOrderClause = "CASE WHEN + " + VideoColumns.DATE_TAKEN + " != 0 THEN "

                    + VideoColumns.DATE_TAKEN + " ELSE (" + VideoColumns.DATE_MODIFIED

                    + " * 1000) END DESC, " + VideoColumns._ID + " DESC";

            mBaseUri = Video.Media.EXTERNAL_CONTENT_URI;

            mProjection = LocalVideo.PROJECTION;

            mItemPath = LocalVideo.ITEM_PATH;

src/com/android/gallery3d/data/LocalMediaItem.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public abstract class LocalMediaItem extends MediaItem { 


    @Override

    public long getDateInMs() {

        return dateTakenInMs;

        return (dateTakenInMs != 0) ? dateTakenInMs : (dateModifiedInSec * 1000);

    }



    @Override

src/com/android/gallery3d/gadget/LocalPhotoSource.java

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ public class LocalPhotoSource implements WidgetSource { 
    /* We don't want to include the download directory */

    private static final String SELECTION =

            String.format("%s != %s", Media.BUCKET_ID, getDownloadBucketId());

    private static final String ORDER = String.format("%s DESC", DATE_TAKEN);

    private static final String ORDER = String.format("CASE WHEN %s != 0 THEN %s ELSE (%s * 1000) END DESC",

            DATE_TAKEN, DATE_TAKEN, Media.DATE_MODIFIED);



    private Context mContext;

    private ArrayList<Long> mPhotos = new ArrayList<Long>();