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

Commit 2a75186e authored by ykhung's avatar ykhung
Browse files

Resolve locale not update issues in the chart view 

- read locale from configuration rather than Locale.getDefault
- refine 12-24 format to align the current status bar short style
- resolve locale change not update chart percentage label
- extend timestamp label in the chart graph from 4 to 5 labels

Bug: 190150515
Bug: 190422902
Bug: 190226837
Test: make SettingsRoboTests
Change-Id: I5347964900123a6d112dbc37c2af87eb7d73f1d2
parent ae1797ec

src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java

+6 −6
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
            final Map<String, BatteryHistEntry> entryMap = batteryHistoryMap.get(timestamp);

            if (entryMap == null || entryMap.isEmpty()) {

                Log.e(TAG, "abnormal entry list in the timestamp:"

                    + ConvertUtils.utcToLocalTime(timestamp));

                    + ConvertUtils.utcToLocalTime(mPrefContext, timestamp));

                continue;

            }

            // Averages the battery level in each time slot to avoid corner conditions.
@@ -287,7 +287,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
        Log.d(TAG, String.format(

            "setBatteryHistoryMap() size=%d\nkeys=%s\nlevels=%s",

            batteryHistoryMap.size(),

            utcToLocalTime(mBatteryHistoryKeys),

            utcToLocalTime(mPrefContext, mBatteryHistoryKeys),

            Arrays.toString(mBatteryHistoryLevels)));



        // Loads item icon and label in the background.
@@ -496,9 +496,9 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
        if (mTrapezoidIndex < 0) {

            return null;

        }

        final String fromHour = ConvertUtils.utcToLocalTimeHour(

        final String fromHour = ConvertUtils.utcToLocalTimeHour(mPrefContext,

            mBatteryHistoryKeys[mTrapezoidIndex * 2], mIs24HourFormat);

        final String toHour = ConvertUtils.utcToLocalTimeHour(

        final String toHour = ConvertUtils.utcToLocalTimeHour(mPrefContext,

            mBatteryHistoryKeys[(mTrapezoidIndex + 1) * 2], mIs24HourFormat);

        return String.format("%s - %s", fromHour, toHour);

    }
@@ -584,11 +584,11 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
        mHandler.post(() -> mPreferenceScreen.addPreference(mFooterPreference));

    }



    private static String utcToLocalTime(long[] timestamps) {

    private static String utcToLocalTime(Context context, long[] timestamps) {

        final StringBuilder builder = new StringBuilder();

        for (int index = 0; index < timestamps.length; index++) {

            builder.append(String.format("%s| ",

                  ConvertUtils.utcToLocalTime(timestamps[index])));

                  ConvertUtils.utcToLocalTime(context, timestamps[index])));

        }

        return builder.toString();

    }

src/com/android/settings/fuelgauge/BatteryChartView.java

+22 −18
Original line number Diff line number Diff line
@@ -56,14 +56,8 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
    private static final List<String> ACCESSIBILITY_SERVICE_NAMES =

        Arrays.asList("SwitchAccessService", "TalkBackService", "JustSpeakService");



    // For drawing the percentage information.

    private static final String[] PERCENTAGES = new String[] {

            formatPercentage(/*percentage=*/ 100, /*round=*/ true),

            formatPercentage(/*percentage=*/ 50, /*round=*/ true),

            formatPercentage(/*percentage=*/ 0, /*round=*/ true)};



    private static final int DEFAULT_TRAPEZOID_COUNT = 12;

    private static final int DEFAULT_TIMESTAMP_COUNT = 4;

    private static final int DEFAULT_TIMESTAMP_COUNT = 5;

    private static final int DIVIDER_COLOR = Color.parseColor("#CDCCC5");

    private static final long UPDATE_STATE_DELAYED_TIME = 500L;
@@ -82,6 +76,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
    private float mTrapezoidVOffset;

    private float mTrapezoidHOffset;

    private boolean mIsSlotsClickabled;

    private String[] mPercentages = getPercentages();



    @VisibleForTesting int mSelectedIndex;

    @VisibleForTesting String[] mTimestamps;
@@ -96,7 +91,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
        new Rect[] {new Rect(), new Rect(), new Rect()};

    // For drawing the timestamp information.

    private final Rect[] mTimestampsBounds =

        new Rect[] {new Rect(), new Rect(), new Rect(), new Rect()};

        new Rect[] {new Rect(), new Rect(), new Rect(), new Rect(), new Rect()};



    @VisibleForTesting

    Handler mHandler = new Handler();
@@ -107,6 +102,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
    private Paint mTextPaint;

    private Paint mDividerPaint;

    private Paint mTrapezoidPaint;



    @VisibleForTesting

    Paint mTrapezoidCurvePaint = null;

    private TrapezoidSlot[] mTrapezoidSlots;
@@ -201,12 +197,13 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
        if (mTimestamps == null) {

            mTimestamps = new String[DEFAULT_TIMESTAMP_COUNT];

        }

        final long timeSlotOffset = DateUtils.HOUR_IN_MILLIS * 8;

        final long timeSlotOffset = DateUtils.HOUR_IN_MILLIS * 6;

        final boolean is24HourFormat = DateFormat.is24HourFormat(getContext());

        for (int index = 0; index < DEFAULT_TIMESTAMP_COUNT; index++) {

            mTimestamps[index] =

                ConvertUtils.utcToLocalTimeHour(

                    latestTimestamp - (3 - index) * timeSlotOffset,

                    getContext(),

                    latestTimestamp - (4 - index) * timeSlotOffset,

                    is24HourFormat);

        }

        requestLayout();
@@ -217,9 +214,9 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        // Measures text bounds and updates indent configuration.

        if (mTextPaint != null) {

            for (int index = 0; index < PERCENTAGES.length; index++) {

            for (int index = 0; index < mPercentages.length; index++) {

                mTextPaint.getTextBounds(

                    PERCENTAGES[index], 0, PERCENTAGES[index].length(),

                    mPercentages[index], 0, mPercentages[index].length(),

                    mPercentageBounds[index]);

            }

            // Updates the indent configurations.
@@ -396,7 +393,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
    private void drawPercentage(Canvas canvas, int index, float offsetY) {

        if (mTextPaint != null) {

            canvas.drawText(

                PERCENTAGES[index],

                mPercentages[index],

                getWidth() - mPercentageBounds[index].width() - mPercentageBounds[index].left,

                offsetY + mPercentageBounds[index].height() *.5f,

                mTextPaint);
@@ -429,7 +426,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
            final float baselineX = mDividerWidth * .5f;

            final float offsetX = mDividerWidth + unitWidth;

            for (int index = 0; index < DEFAULT_TIMESTAMP_COUNT; index++) {

                xOffsets[index] = baselineX + index * offsetX * 4;

                xOffsets[index] = baselineX + index * offsetX * 3;

            }

            drawTimestamp(canvas, xOffsets);

        }
@@ -443,11 +440,11 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
            getTimestampY(0), mTextPaint);

        // Draws the last timestamp info.

        canvas.drawText(

            mTimestamps[3],

            xOffsets[3] - mTimestampsBounds[3].width() - mTimestampsBounds[3].left,

            getTimestampY(3), mTextPaint);

            mTimestamps[4],

            xOffsets[4] - mTimestampsBounds[4].width() - mTimestampsBounds[4].left,

            getTimestampY(4), mTextPaint);

        // Draws the rest of timestamp info since it is located in the center.

        for (int index = 1; index <= 2; index++) {

        for (int index = 1; index <= 3; index++) {

            canvas.drawText(

                mTimestamps[index],

                xOffsets[index] -
@@ -544,6 +541,13 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
                && mLevels[trapezoidIndex + 1] != 0;

    }



    private static String[] getPercentages() {

        return new String[] {

            formatPercentage(/*percentage=*/ 100, /*round=*/ true),

            formatPercentage(/*percentage=*/ 50, /*round=*/ true),

            formatPercentage(/*percentage=*/ 0, /*round=*/ true)};

    }



    @VisibleForTesting

    static boolean isAccessibilityEnabled(Context context) {

        final AccessibilityManager accessibilityManager =

src/com/android/settings/fuelgauge/BatteryHistEntry.java

+2 −1
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ public class BatteryHistEntry { 


    @Override

    public String toString() {

        final String recordAtDateTime = ConvertUtils.utcToLocalTime(mTimestamp);

        final String recordAtDateTime =

            ConvertUtils.utcToLocalTime(/*context=*/ null, mTimestamp);

        final StringBuilder builder = new StringBuilder()

            .append("\nBatteryHistEntry{")

            .append(String.format("\n\tpackage=%s|label=%s|uid=%d|userId=%d|isHidden=%b",

src/com/android/settings/fuelgauge/ConvertUtils.java

+18 −5
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import android.annotation.IntDef; 
import android.content.ContentValues;

import android.content.Context;

import android.os.BatteryUsageStats;

import android.os.LocaleList;

import android.os.UserHandle;

import android.text.format.DateUtils;

import android.util.Log;
@@ -133,8 +134,8 @@ public final class ConvertUtils { 
    }



    /** Converts UTC timestamp to human readable local time string. */

    public static String utcToLocalTime(long timestamp) {

        final Locale currentLocale = Locale.getDefault();

    public static String utcToLocalTime(Context context, long timestamp) {

        final Locale currentLocale = getLocale(context);

        final String currentZoneId = TimeZone.getDefault().getID();

        if (!currentZoneId.equals(sZoneId)

                || !currentLocale.equals(sLocale)
@@ -148,8 +149,9 @@ public final class ConvertUtils { 
    }



    /** Converts UTC timestamp to local time hour data. */

    public static String utcToLocalTimeHour(long timestamp, boolean is24HourFormat) {

        final Locale currentLocale = Locale.getDefault();

    public static String utcToLocalTimeHour(

            Context context, long timestamp, boolean is24HourFormat) {

        final Locale currentLocale = getLocale(context);

        final String currentZoneId = TimeZone.getDefault().getID();

        if (!currentZoneId.equals(sZoneIdForHour)

                || !currentLocale.equals(sLocaleForHour)
@@ -159,7 +161,7 @@ public final class ConvertUtils { 
            sZoneIdForHour = currentZoneId;

            sIs24HourFormat = is24HourFormat;

            sSimpleDateFormatForHour = new SimpleDateFormat(

                    sIs24HourFormat ? "HH" : "h aa", currentLocale);

                    sIs24HourFormat ? "HH" : "h", currentLocale);

        }

        return sSimpleDateFormatForHour.format(new Date(timestamp))

            .toLowerCase(currentLocale);
@@ -356,4 +358,15 @@ public final class ConvertUtils { 
                ? entry3 : null;

        }

    }



    @VisibleForTesting

    static Locale getLocale(Context context) {

        if (context == null) {

            return Locale.getDefault();

        }

        final LocaleList locales =

            context.getResources().getConfiguration().getLocales();

        return locales != null && !locales.isEmpty() ? locales.get(0)

            : Locale.getDefault();

    }

}

tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java

+7 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.content.res.Configuration; 
import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.LocaleList;

import android.text.format.DateUtils;

import android.util.Pair;
@@ -100,6 +101,8 @@ public final class BatteryChartPreferenceControllerTest { 
        mFeatureFactory = FakeFeatureFactory.setupForTest();

        mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;

        mContext = spy(RuntimeEnvironment.application);

        mContext.getResources().getConfiguration().setLocales(

            new LocaleList(new Locale("en_US")));

        mBatteryChartPreferenceController = createController();

        mBatteryChartPreferenceController.mPrefContext = mContext;

        mBatteryChartPreferenceController.mAppListPrefGroup = mAppListGroup;
@@ -573,14 +576,12 @@ public final class BatteryChartPreferenceControllerTest { 
        // Verifies the title in the preference group.

        verify(mBatteryChartPreferenceController.mAppListPrefGroup)

            .setTitle(captor.capture());

        assertThat(captor.getValue())

            .isEqualTo("App usage for 4 pm - 7 am");

        assertThat(captor.getValue()).isEqualTo("App usage for 4 - 7");

        // Verifies the title in the expandable divider.

        captor = ArgumentCaptor.forClass(String.class);

        verify(mBatteryChartPreferenceController.mExpandDividerPreference)

            .setTitle(captor.capture());

        assertThat(captor.getValue())

            .isEqualTo("System usage for 4 pm - 7 am");

        assertThat(captor.getValue()).isEqualTo("System usage for 4 - 7");

    }



    @Test
@@ -716,7 +717,8 @@ public final class BatteryChartPreferenceControllerTest { 
    private void setUpBatteryHistoryKeys() {

        mBatteryChartPreferenceController.mBatteryHistoryKeys =

            new long[] {1619196786769L, 0L, 1619247636826L};

        ConvertUtils.utcToLocalTimeHour(/*timestamp=*/ 0, /*is24HourFormat=*/ false);

        ConvertUtils.utcToLocalTimeHour(

            mContext, /*timestamp=*/ 0, /*is24HourFormat=*/ false);

        // Simulates the locale in GMT.

        ConvertUtils.sSimpleDateFormatForHour

             .setTimeZone(TimeZone.getTimeZone("GMT"));