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

Commit aad84744 authored by Steve McKay's avatar Steve McKay
Browse files

Honor 12/24 user setting in Get Info date/time. 

Bug: 77590891
Test: Manual
Change-Id: I9c1735db72c47b09d1b6daa87d42f8567f968479
parent 7bd7f0d1

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 


    <string name="default_root_uri" translatable="false">content://com.android.providers.downloads.documents/root/downloads</string>



    <string name="datetime_format_12" translatable="false">MMM dd, yyyy, h:mm a</string>

    <string name="datetime_format_24" translatable="false">MMM dd, yyyy, H:mm</string>



    <!--

        New features must be added behind a boolean flag prefixed w/ "feature_".

        Please add them in alphabetical order. Same goes for accessor

src/com/android/documentsui/inspector/DateUtils.java

+13 −3
Original line number Diff line number Diff line
@@ -15,7 +15,12 @@ 
 */

package com.android.documentsui.inspector;



import android.content.Context;

import android.content.res.Resources;

import android.text.format.DateFormat;



import com.android.documentsui.R;



import java.util.Locale;



/**
@@ -28,9 +33,14 @@ final class DateUtils { 
     * @param date Unix timestamp

     * @return formatted String of date

     */

    static String formatDate(long date) {

        String format = DateFormat.getBestDateTimePattern(Locale.getDefault(),

                "MMM dd, yyyy, hh:mm");

    static String formatDate(Context context, long date) {

        Resources res = context.getResources();

        int formatRes = DateFormat.is24HourFormat(context)

                ? R.string.datetime_format_24

                : R.string.datetime_format_12;

        String format = DateFormat.getBestDateTimePattern(

                Locale.getDefault(),

                res.getString(formatRes));

        return DateFormat.format(format, date).toString();

    }

}

src/com/android/documentsui/inspector/DetailsView.java

+3 −2
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ public class DetailsView extends TableView implements DetailsDisplay { 
        }



        if (doc.lastModified > 0) {

            put(R.string.sort_dimension_date, DateUtils.formatDate(doc.lastModified));

            put(R.string.sort_dimension_date,

                    DateUtils.formatDate(this.getContext(), doc.lastModified));

        }



        // We only show summary field when doc is partial (meaning an active download).