Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make CornerHandleView use device radius." into qt-dev

Browse Source
This commit is contained in:
Matt Casey
2019-05-31 18:49:42 +00:00
committed by Android (Google) Code Review
parent bc20854746 bdb3cb325d
commit f4b45a602c
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/SystemUI/src/com/android/systemui/CornerHandleView.java
View File

@@ -36,9 +36,9 @@ import com.android.settingslib.Utils;
public class CornerHandleView extends View { public class CornerHandleView extends View {
private static final boolean ALLOW_TUNING = false; private static final boolean ALLOW_TUNING = false;
private static final int ANGLE_DEGREES = 50; private static final int ANGLE_DEGREES = 50;
public static final int MARGIN_DP = 11; private static final float STROKE_DP = 2.5f;
public static final int RADIUS_DP = 37; // Radius to use if none is available.
public static final float STROKE_DP = 2.5f; private static final int FALLBACK_RADIUS_DP = 15;
private Paint mPaint; private Paint mPaint;
private int mLightColor; private int mLightColor;
@@ -71,7 +71,7 @@ public class CornerHandleView extends View {
/** /**
* Receives an intensity from 0 (lightest) to 1 (darkest) and sets the handle color * Receives an intensity from 0 (lightest) to 1 (darkest) and sets the handle color
* approriately. Intention is to match the home handle color. * appropriately. Intention is to match the home handle color.
*/ */
public void updateDarkness(float darkIntensity) { public void updateDarkness(float darkIntensity) {
mPaint.setColor((int) ArgbEvaluator.getInstance().evaluate(darkIntensity, mPaint.setColor((int) ArgbEvaluator.getInstance().evaluate(darkIntensity,
@@ -115,20 +115,37 @@ public class CornerHandleView extends View {
} }
private int getMarginPx() { private int getMarginPx() {
// Hand-derived function to map radiusPx to the margin amount.
// https://www.wolframalpha.com/input/?i=0.001402+*+x+%5E2%E2%88%920.08661+*+x%2B17.20+from+40+to+180
int radius = getRadiusPx();
int marginPx = (int) (0.001402f * radius * radius - 0.08661f * radius + 17.2f);
if (ALLOW_TUNING) { if (ALLOW_TUNING) {
return SystemProperties.getInt("CORNER_HANDLE_MARGIN_PX", return SystemProperties.getInt("CORNER_HANDLE_MARGIN_PX", marginPx);
(int) convertDpToPixel(MARGIN_DP, getContext()));
} else { } else {
return (int) convertDpToPixel(MARGIN_DP, getContext()); return marginPx;
} }
} }
private int getRadiusPx() { private int getRadiusPx() {
// Attempt to get the bottom corner radius, otherwise fall back on the generic or top
// values. If none are available, use the FALLBACK_RADIUS_DP.
int radius = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.rounded_corner_radius_bottom);
if (radius == 0) {
radius = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.rounded_corner_radius);
}
if (radius == 0) {
radius = getResources().getDimensionPixelSize(
com.android.internal.R.dimen.rounded_corner_radius_top);
}
if (radius == 0) {
radius = (int) convertDpToPixel(FALLBACK_RADIUS_DP, mContext);
}
if (ALLOW_TUNING) { if (ALLOW_TUNING) {
return SystemProperties.getInt("CORNER_HANDLE_RADIUS_PX", return SystemProperties.getInt("CORNER_HANDLE_RADIUS_PX", radius);
(int) convertDpToPixel(RADIUS_DP, getContext()));
} else { } else {
return (int) convertDpToPixel(RADIUS_DP, getContext()); return radius;
} }
} }