Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1

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

Change-Id: I0d867616b7b83cb9b5f1eb4f2c5aaab5e10461bb
This commit is contained in:
PETER LIANG
2020-06-19 05:59:59 +00:00
committed by Automerger Merge Worker

View File

@@ -16,6 +16,8 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.android.settings.Utils.isNightMode;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.content.res.Resources; import android.content.res.Resources;
@@ -113,8 +115,7 @@ public class BalanceSeekBar extends SeekBar {
res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_width), res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_width),
res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_height)); res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_height));
mCenterMarkerPaint = new Paint(); mCenterMarkerPaint = new Paint();
// TODO use a more suitable colour? mCenterMarkerPaint.setColor(isNightMode(context) ? Color.WHITE : Color.BLACK);
mCenterMarkerPaint.setColor(Color.BLACK);
mCenterMarkerPaint.setStyle(Paint.Style.FILL); mCenterMarkerPaint.setStyle(Paint.Style.FILL);
// Remove the progress colour // Remove the progress colour
setProgressTintList(ColorStateList.valueOf(Color.TRANSPARENT)); setProgressTintList(ColorStateList.valueOf(Color.TRANSPARENT));