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

Commit 01e427ce authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change formatting for device up time."

parents 87fb33d4 3e792551

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public abstract class AbstractUptimePreferenceController extends AbstractPrefere 
    }



    private void updateTimes() {

        mUptime.setSummary(DateUtils.formatDuration(SystemClock.elapsedRealtime()));

        mUptime.setSummary(DateUtils.formatElapsedTime(SystemClock.elapsedRealtime() / 1000));

    }



    private static class MyHandler extends Handler {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ public class UptimePreferenceControllerTest { 
        uptimePreferenceController.displayPreference(mScreen);



        // SystemClock is shadowed so it shouldn't advance unexpectedly while the test is running

        verify(mPreference).setSummary(DateUtils.formatDuration(SystemClock.elapsedRealtime()));

        verify(mPreference).setSummary(

                DateUtils.formatElapsedTime(SystemClock.elapsedRealtime() / 1000));

    }



    @Test