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

Add test cases for BalanceSeekBar

Browse Source 
Bug: 123722274
Test: Manual
      make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBar

Change-Id: Ie6b560b2f92d78a0d3bd7ddb0e0d0a85c7803827
This commit is contained in:
Kevin Chang
2019-02-23 08:46:34 +08:00
parent 38d1640da5
commit a22bd67d5c
4 changed files with 204 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/accessibility/BalanceSeekBar.java
View File

@@ -28,6 +28,8 @@ import android.provider.Settings;
import android.util.AttributeSet;
import android.widget.SeekBar;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
/**
@@ -37,14 +39,13 @@ import com.android.settings.R;
* Updates Settings.System for balance on progress changed.
*/
public class BalanceSeekBar extends SeekBar {
private static final String TAG = "BalanceSeekBar";
private final Context mContext;
private final Object mListenerLock = new Object();
private OnSeekBarChangeListener mOnSeekBarChangeListener;
private final OnSeekBarChangeListener mProxySeekBarListener = new OnSeekBarChangeListener() {
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
synchronized(mListenerLock) {
synchronized (mListenerLock) {
if (mOnSeekBarChangeListener != null) {
mOnSeekBarChangeListener.onStopTrackingTouch(seekBar);
}
@@ -53,7 +54,7 @@ public class BalanceSeekBar extends SeekBar {
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
synchronized(mListenerLock) {
synchronized (mListenerLock) {
if (mOnSeekBarChangeListener != null) {
mOnSeekBarChangeListener.onStartTrackingTouch(seekBar);
}
@@ -79,7 +80,7 @@ public class BalanceSeekBar extends SeekBar {
// after adjusting the seekbar, notify downstream listener.
// note that progress may have been adjusted in the code above to mCenter.
synchronized(mListenerLock) {
synchronized (mListenerLock) {
if (mOnSeekBarChangeListener != null) {
mOnSeekBarChangeListener.onProgressChanged(seekBar, progress, fromUser);
}
@@ -88,7 +89,8 @@ public class BalanceSeekBar extends SeekBar {
};
// Percentage of max to be used as a snap to threshold
private static final float SNAP_TO_PERCENTAGE = 0.03f;
@VisibleForTesting
static final float SNAP_TO_PERCENTAGE = 0.03f;
private final Paint mCenterMarkerPaint;
private final Rect mCenterMarkerRect;
// changed in setMax()
@@ -122,7 +124,7 @@ public class BalanceSeekBar extends SeekBar {
@Override
public void setOnSeekBarChangeListener(OnSeekBarChangeListener listener) {
synchronized(mListenerLock) {
synchronized (mListenerLock) {
mOnSeekBarChangeListener = listener;
}
}
@@ -148,5 +150,10 @@ public class BalanceSeekBar extends SeekBar {
canvas.restore();
super.onDraw(canvas);
}
@VisibleForTesting
OnSeekBarChangeListener getProxySeekBarListener() {
return mProxySeekBarListener;
}
}

10
src/com/android/settings/accessibility/BalanceSeekBarPreference.java
View File

@@ -34,7 +34,9 @@ import com.android.settings.widget.SeekBarPreference;
/** A slider preference that directly controls audio balance **/
public class BalanceSeekBarPreference extends SeekBarPreference {
private static final String TAG = "BalanceSeekBarPreference";
private static final int BALANCE_CENTER_VALUE = 100;
private static final int BALANCE_MAX_VALUE = 200;
private final Context mContext;
private BalanceSeekBar mSeekBar;
private ImageView mIconView;
@@ -62,9 +64,9 @@ public class BalanceSeekBarPreference extends SeekBarPreference {
final float balance = Settings.System.getFloatForUser(
mContext.getContentResolver(), Settings.System.MASTER_BALANCE,
0.f /* default */, UserHandle.USER_CURRENT);
// Rescale balance to range 0-200 centered at 100.
mSeekBar.setMax(200);
mSeekBar.setProgress((int)(balance * 100.f) + 100);
// Rescale balance to range 0-BALANCE_MAX_VALUE centered at BALANCE_MAX_VALUE / 2.
mSeekBar.setMax(BALANCE_MAX_VALUE);
mSeekBar.setProgress((int) (balance * 100.f) + BALANCE_CENTER_VALUE);
mSeekBar.setEnabled(isEnabled());
}
}