diff options
| -rw-r--r-- | packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png | bin | 0 -> 108 bytes | |||
| -rw-r--r-- | packages/SystemUI/res/values/ice_config.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java | 16 |
3 files changed, 18 insertions, 1 deletions
diff --git a/packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png b/packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png Binary files differnew file mode 100644 index 000000000000..4102e28c1300 --- /dev/null +++ b/packages/SystemUI/res/drawable-nodpi/udfps_icon_pressed.png diff --git a/packages/SystemUI/res/values/ice_config.xml b/packages/SystemUI/res/values/ice_config.xml index c13dda7076a9..563d63f7ac2a 100644 --- a/packages/SystemUI/res/values/ice_config.xml +++ b/packages/SystemUI/res/values/ice_config.xml @@ -14,6 +14,9 @@ limitations under the License. --> <resources> + <!-- Color of the UDFPS pressed view --> + <color name="config_udfpsColor">#ffffffff</color> + <!-- Allow devices override audio panel location to the left side --> <bool name="config_audioPanelOnLeftSide">false</bool> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java index f5ada948dab7..2488132b508b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java @@ -19,6 +19,7 @@ package com.android.systemui.biometrics; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; +import android.graphics.drawable.Drawable; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.PixelFormat; @@ -29,6 +30,8 @@ import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; +import com.android.systemui.R; + /** * Surface View for providing the Global High-Brightness Mode (GHBM) illumination for UDFPS. */ @@ -54,6 +57,8 @@ public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callb boolean mAwaitingSurfaceToStartIllumination; boolean mHasValidSurface; + private Drawable mUdfpsIconPressed; + public UdfpsSurfaceView(Context context, AttributeSet attrs) { super(context, attrs); @@ -69,8 +74,10 @@ public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callb mSensorPaint = new Paint(0 /* flags */); mSensorPaint.setAntiAlias(true); - mSensorPaint.setARGB(255, 255, 255, 255); + mSensorPaint.setColor(context.getColor(R.color.config_udfpsColor)); mSensorPaint.setStyle(Paint.Style.FILL); + + mUdfpsIconPressed = context.getDrawable(R.drawable.udfps_icon_pressed); } @Override public void surfaceCreated(SurfaceHolder holder) { @@ -134,6 +141,13 @@ public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callb Canvas canvas = null; try { canvas = mHolder.lockCanvas(); + mUdfpsIconPressed.setBounds( + Math.round(sensorRect.left), + Math.round(sensorRect.top), + Math.round(sensorRect.right), + Math.round(sensorRect.bottom) + ); + mUdfpsIconPressed.draw(canvas); canvas.drawOval(sensorRect, mSensorPaint); } finally { // Make sure the surface is never left in a bad state. |
