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

Commit 1469f1c9 authored by Steve McKay's avatar Steve McKay
Browse files

Format video duration as "HH:MM:SS". 

Bug: 64162451
Test: Ran small and medium.
Change-Id: I21fa3a10e54ea86ba436287b53b6d28d1406db3a
parent ce28927a

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

+2 −2
Original line number Diff line number Diff line
@@ -391,12 +391,12 @@ public final class InspectorController { 
        /**

         * Adds a row in the table.

         */

        void put(@StringRes int keyId, String value);

        void put(@StringRes int keyId, CharSequence value);



        /**

         * Adds a row in the table and makes it clickable.

         */

        void put(@StringRes int keyId, String value, OnClickListener callback);

        void put(@StringRes int keyId, CharSequence value, OnClickListener callback);



        /**

         * Returns true if there are now rows in the display. Does not consider the title.

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class KeyValueRow extends LinearLayout { 
        setKey(mRes.getString(id));

    }



    public void setValue(String value) {

    public void setValue(CharSequence value) {

        ((TextView) findViewById(R.id.table_row_value)).setText(value);

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.media.MediaMetadata; 
import android.os.Bundle;

import android.provider.DocumentsContract;

import android.support.annotation.VisibleForTesting;

import android.text.format.DateUtils;

import android.util.AttributeSet;



import com.android.documentsui.R;
@@ -71,8 +72,8 @@ public class MediaView extends TableView implements MediaDisplay { 


    private void showVideoData(DocumentInfo doc, Bundle tags) {

        if (tags.containsKey(MediaMetadata.METADATA_KEY_DURATION)) {

            float seconds = tags.getInt(MediaMetadata.METADATA_KEY_DURATION) / 1000.0f;

            put(R.string.metadata_duration, seconds + "s");

            int millis = tags.getInt(MediaMetadata.METADATA_KEY_DURATION);

            put(R.string.metadata_duration, DateUtils.formatElapsedTime(millis));

        }

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -77,14 +77,14 @@ public class TableView extends LinearLayout implements TableDisplay { 
     * Puts or updates an value in the table view.

     */

    @Override

    public void put(@StringRes int keyId, String value) {

    public void put(@StringRes int keyId, CharSequence value) {

        put(mRes.getString(keyId), value);

    }



    /**

     * Puts or updates an value in the table view.

     */

    protected KeyValueRow put(String key, String value) {

    protected KeyValueRow put(String key, CharSequence value) {

        KeyValueRow row = mRows.get(key);



        if (row == null) {
@@ -100,7 +100,7 @@ public class TableView extends LinearLayout implements TableDisplay { 
    }



    @Override

    public void put(@StringRes int keyId, String value, OnClickListener callback) {

    public void put(@StringRes int keyId, CharSequence value, OnClickListener callback) {

        put(keyId, value);

        mRows.get(mRes.getString(keyId)).setOnClickListener(callback);

    }

tests/unit/com/android/documentsui/inspector/TestTable.java

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.util.Map; 
 */

class TestTable implements TableDisplay {



    private Map<Integer, String> calledBundleKeys;

    private Map<Integer, CharSequence> calledBundleKeys;

    private boolean mVisible;



    public TestTable() {
@@ -47,12 +47,12 @@ class TestTable implements TableDisplay { 
    }



    @Override

    public void put(int keyId, String value) {

    public void put(int keyId, CharSequence value) {

        calledBundleKeys.put(keyId, value);

    }



    @Override

    public void put(int keyId, String value, OnClickListener callback) {

    public void put(int keyId, CharSequence value, OnClickListener callback) {

        calledBundleKeys.put(keyId, value);

    }