PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support old pixel devices to adopt non-clickable chart design

Browse Source 
For clickable devices:
https://screenshot.googleplex.com/ktBfjhhHQVYfTmF
https://screenshot.googleplex.com/BYutnpu9Dys2sa6
For non-clickable devices:
https://screenshot.googleplex.com/64NaKhRDrhfBqBQ

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: I5bc0bb31946ccb20007ea31d90c05673a200e072
This commit is contained in:
ykhung
2021-05-10 00:18:54 +08:00
committed by YUKAI HUNG
parent d8d5335096
commit 28896636b0
1 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/com/android/settings/fuelgauge/BatteryChartView.java
View File

@@ -80,6 +80,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
private Paint mTextPaint; private Paint mTextPaint;
private Paint mDividerPaint; private Paint mDividerPaint;
private Paint mTrapezoidPaint; private Paint mTrapezoidPaint;
private Paint mTrapezoidCurvePaint = null;
private TrapezoidSlot[] mTrapezoidSlots; private TrapezoidSlot[] mTrapezoidSlots;
// Records the location to calculate selected index. // Records the location to calculate selected index.
private MotionEvent mTouchUpEvent; private MotionEvent mTouchUpEvent;
@@ -231,7 +232,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
final int trapezoidIndex = getTrapezoidIndex(mTouchUpEvent.getX()); final int trapezoidIndex = getTrapezoidIndex(mTouchUpEvent.getX());
// Ignores the click event if the level is zero. // Ignores the click event if the level is zero.
if (trapezoidIndex == SELECTED_INDEX_INVALID if (trapezoidIndex == SELECTED_INDEX_INVALID
|| (trapezoidIndex >= 0 && mLevels[trapezoidIndex] == 0)) { || !isValidToDraw(trapezoidIndex)) {
return; return;
} }
// Selects all if users click the same trapezoid item two times. // Selects all if users click the same trapezoid item two times.
@@ -253,6 +254,14 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
.isChartGraphSlotsEnabled(context); .isChartGraphSlotsEnabled(context);
Log.d(TAG, "isChartGraphSlotsEnabled:" + mIsSlotsClickable); Log.d(TAG, "isChartGraphSlotsEnabled:" + mIsSlotsClickable);
setClickable(isClickable()); setClickable(isClickable());
// Initializes the trapezoid curve paint for non-clickable case.
if (!mIsSlotsClickable && mTrapezoidCurvePaint == null) {
mTrapezoidCurvePaint = new Paint();
mTrapezoidCurvePaint.setAntiAlias(true);
mTrapezoidCurvePaint.setColor(mTrapezoidSolidColor);
mTrapezoidCurvePaint.setStyle(Paint.Style.STROKE);
mTrapezoidCurvePaint.setStrokeWidth(mDividerWidth * 2);
}
} }
@Override @Override
@@ -391,16 +400,24 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
final float unitHeight = availableSpace / 100f; final float unitHeight = availableSpace / 100f;
// Draws all trapezoid shapes into the canvas. // Draws all trapezoid shapes into the canvas.
final Path trapezoidPath = new Path(); final Path trapezoidPath = new Path();
Path trapezoidCurvePath = null;
for (int index = 0; index < mTrapezoidCount; index++) { for (int index = 0; index < mTrapezoidCount; index++) {
// Not draws the trapezoid for corner or not initialization cases. // Not draws the trapezoid for corner or not initialization cases.
if (mLevels[index] == 0 || mLevels[index + 1] == 0) { if (!isValidToDraw(index)) {
if (mTrapezoidCurvePaint != null && trapezoidCurvePath != null) {
canvas.drawPath(trapezoidCurvePath, mTrapezoidCurvePaint);
trapezoidCurvePath = null;
}
continue; continue;
} }
// Configures the trapezoid paint color. // Configures the trapezoid paint color.
mTrapezoidPaint.setColor( final int trapezoidColor =
mSelectedIndex == index || mSelectedIndex == SELECTED_INDEX_ALL !mIsSlotsClickable
? mTrapezoidSolidColor ? mTrapezoidColor
: mTrapezoidColor); : mSelectedIndex == index || mSelectedIndex == SELECTED_INDEX_ALL
? mTrapezoidSolidColor : mTrapezoidColor;
mTrapezoidPaint.setColor(trapezoidColor);
final float leftTop = round(trapezoidBottom - mLevels[index] * unitHeight); final float leftTop = round(trapezoidBottom - mLevels[index] * unitHeight);
final float rightTop = round(trapezoidBottom - mLevels[index + 1] * unitHeight); final float rightTop = round(trapezoidBottom - mLevels[index + 1] * unitHeight);
trapezoidPath.reset(); trapezoidPath.reset();
@@ -413,6 +430,22 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
trapezoidPath.lineTo(mTrapezoidSlots[index].mLeft, leftTop); trapezoidPath.lineTo(mTrapezoidSlots[index].mLeft, leftTop);
// Draws the trapezoid shape into canvas. // Draws the trapezoid shape into canvas.
canvas.drawPath(trapezoidPath, mTrapezoidPaint); canvas.drawPath(trapezoidPath, mTrapezoidPaint);
// Generates path for non-clickable trapezoid curve.
if (mTrapezoidCurvePaint != null) {
if (trapezoidCurvePath == null) {
trapezoidCurvePath= new Path();
trapezoidCurvePath.moveTo(mTrapezoidSlots[index].mLeft, leftTop);
} else {
trapezoidCurvePath.lineTo(mTrapezoidSlots[index].mLeft, leftTop);
}
trapezoidCurvePath.lineTo(mTrapezoidSlots[index].mRight, rightTop);
}
}
// Draws the trapezoid curve for non-clickable case.
if (mTrapezoidCurvePaint != null && trapezoidCurvePath != null) {
canvas.drawPath(trapezoidCurvePath, mTrapezoidCurvePaint);
trapezoidCurvePath = null;
} }
} }
@@ -428,6 +461,14 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
return SELECTED_INDEX_INVALID; return SELECTED_INDEX_INVALID;
} }
private boolean isValidToDraw(int trapezoidIndex) {
return mLevels != null
&& trapezoidIndex >= 0
&& trapezoidIndex < mLevels.length - 1
&& mLevels[trapezoidIndex] != 0
&& mLevels[trapezoidIndex + 1] != 0;
}
// A container class for each trapezoid left and right location. // A container class for each trapezoid left and right location.
private static final class TrapezoidSlot { private static final class TrapezoidSlot {
public float mLeft; public float mLeft;