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

Commit bc8d6ba1 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Add support of RTL design for battery ussage chart." into udc-qpr-dev... 

Merge "Add support of RTL design for battery ussage chart." into udc-qpr-dev am: 448891b6 am: a3863665

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24080658



Change-Id: I6de5676a5b307fc813a4e305fd364c50a057b628
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 554bdfd4 a3863665

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

+39 −13
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batteryusage; 
import static com.android.settings.Utils.formatPercentage;

import static com.android.settings.fuelgauge.batteryusage.BatteryChartViewModel.AxisLabelPosition.BETWEEN_TRAPEZOIDS;



import static java.lang.Math.abs;

import static java.lang.Math.round;

import static java.util.Objects.requireNonNull;
@@ -74,6 +75,8 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
    private final Rect[] mPercentageBounds = new Rect[]{new Rect(), new Rect(), new Rect()};

    private final List<Rect> mAxisLabelsBounds = new ArrayList<>();

    private final Set<Integer> mLabelDrawnIndexes = new ArraySet<>();

    private final int mLayoutDirection =

            getContext().getResources().getConfiguration().getLayoutDirection();



    private BatteryChartViewModel mViewModel;

    private int mHoveredIndex = BatteryChartViewModel.SELECTED_INDEX_INVALID;
@@ -159,7 +162,12 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
            }

            // Updates the indent configurations.

            mIndent.top = mPercentageBounds[0].height();

            mIndent.right = mPercentageBounds[0].width() + mTextPadding;

            final int textWidth = mPercentageBounds[0].width() + mTextPadding;

            if (isRTL()) {

                mIndent.left = textWidth;

            } else {

                mIndent.right = textWidth;

            }



            if (mViewModel != null) {

                int maxTop = 0;
@@ -334,7 +342,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
    }



    private void drawHorizontalDividers(Canvas canvas) {

        final int width = getWidth() - mIndent.right;

        final int width = getWidth() - abs(mIndent.width());

        final int height = getHeight() - mIndent.top - mIndent.bottom;

        final float topOffsetY = mIndent.top + mDividerWidth * .5f;

        final float bottomOffsetY = mIndent.top + (height - mDividerHeight - mDividerWidth * .5f);
@@ -347,7 +355,8 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
        // Draws 5 divider lines.

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

            float offsetY = topOffsetY + dividerOffsetUnit * index;

            canvas.drawLine(0, offsetY, width, offsetY, mDividerPaint);

            canvas.drawLine(mIndent.left, offsetY,

                    mIndent.left + width, offsetY, mDividerPaint);



            //  Draws percentage text only for 100% / 50% / 0%

            if (index % 2 == 0) {
@@ -362,14 +371,14 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
            mTextPaint.setColor(mDefaultTextColor);

            canvas.drawText(

                    mPercentages[index],

                    getWidth(),

                    isRTL() ? mIndent.left - mTextPadding : getWidth(),

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

                    mTextPaint);

        }

    }



    private void drawVerticalDividers(Canvas canvas) {

        final int width = getWidth() - mIndent.right;

        final int width = getWidth() - abs(mIndent.width());

        final int dividerCount = mTrapezoidSlots.length + 1;

        final float dividerSpace = dividerCount * mDividerWidth;

        final float unitWidth = (width - dividerSpace) / (float) mTrapezoidSlots.length;
@@ -384,7 +393,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
                case CENTER_OF_TRAPEZOIDS:

                    axisLabelDisplayAreas = getAxisLabelDisplayAreas(

                            /* size= */ mViewModel.size() - 1,

                            /* baselineX= */ mDividerWidth + unitWidth * .5f,

                            /* baselineX= */ mIndent.left + mDividerWidth + unitWidth * .5f,

                            /* offsetX= */ mDividerWidth + unitWidth,

                            baselineY,

                            /* shiftFirstAndLast= */ false);
@@ -393,7 +402,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
                default:

                    axisLabelDisplayAreas = getAxisLabelDisplayAreas(

                            /* size= */ mViewModel.size(),

                            /* baselineX= */ mDividerWidth * .5f,

                            /* baselineX= */ mIndent.left + mDividerWidth * .5f,

                            /* offsetX= */ mDividerWidth + unitWidth,

                            baselineY,

                            /* shiftFirstAndLast= */ true);
@@ -402,7 +411,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
            drawAxisLabels(canvas, axisLabelDisplayAreas, baselineY);

        }

        // Draws each vertical dividers.

        float startX = mDividerWidth * .5f;

        float startX = mDividerWidth * .5f + mIndent.left;

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

            float dividerY = bottomY;

            if (mViewModel.axisLabelPosition() == BETWEEN_TRAPEZOIDS
@@ -416,8 +425,9 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
            final float nextX = startX + mDividerWidth + unitWidth;

            // Updates the trapezoid slots for drawing.

            if (index < mTrapezoidSlots.length) {

                mTrapezoidSlots[index].mLeft = round(startX + trapezoidSlotOffset);

                mTrapezoidSlots[index].mRight = round(nextX - trapezoidSlotOffset);

                final int trapezoidIndex = isRTL() ? mTrapezoidSlots.length - index - 1 : index;

                mTrapezoidSlots[trapezoidIndex].mLeft = round(startX + trapezoidSlotOffset);

                mTrapezoidSlots[trapezoidIndex].mRight = round(nextX - trapezoidSlotOffset);

            }

            startX = nextX;

        }
@@ -509,10 +519,20 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
        return displayAreas[leftIndex].right + mTextPadding * 2.3f > displayAreas[rightIndex].left;

    }



    private boolean isRTL() {

        return mLayoutDirection == View.LAYOUT_DIRECTION_RTL;

    }



    private void drawAxisLabelText(

            Canvas canvas, final int index, final Rect displayArea, final float baselineY) {

            Canvas canvas, int index, final Rect displayArea, final float baselineY) {

        mTextPaint.setColor(mTrapezoidSolidColor);

        mTextPaint.setTextAlign(Paint.Align.CENTER);

        // Reverse the sort of axis labels for RTL

        if (isRTL()) {

            index = mViewModel.axisLabelPosition() == BETWEEN_TRAPEZOIDS

                            ? mViewModel.size() - index - 1     // for hourly

                            : mViewModel.size() - index - 2;    // for daily

        }

        canvas.drawText(

                mViewModel.getText(index),

                displayArea.centerX(),
@@ -548,10 +568,16 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick 
                    mHoveredIndex);

            mTrapezoidPaint.setColor(isHoverState ? mTrapezoidHoverColor : trapezoidColor);



            final float leftTop = round(

            float leftTop = round(

                    trapezoidBottom - requireNonNull(mViewModel.getLevel(index)) * unitHeight);

            final float rightTop = round(trapezoidBottom

            float rightTop = round(trapezoidBottom

                    - requireNonNull(mViewModel.getLevel(index + 1)) * unitHeight);

            // Mirror the shape of the trapezoid for RTL

            if (isRTL()) {

                float temp = leftTop;

                leftTop = rightTop;

                rightTop = temp;

            }

            trapezoidPath.reset();

            trapezoidPath.moveTo(mTrapezoidSlots[index].mLeft, trapezoidBottom);

            trapezoidPath.lineTo(mTrapezoidSlots[index].mLeft, leftTop);