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

Add summary to "Vibration & haptics" settings

Browse Source 
Use VIBRATE_ON main toggle to display on/off state as summary for
"Vibration & haptics" settings provider.

Fix: 220218654
Test: VibrationPreferenceControllerTest
Change-Id: Ifd4b9c7b1cb68ad0ea535091804a1e7f54297c44
This commit is contained in:
Lais Andrade
2022-03-22 16:28:30 +00:00
parent e7b38f27a3
commit 68d7b91bb1
2 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/accessibility/VibrationPreferenceController.java
View File

@@ -16,9 +16,13 @@
package com.android.settings.accessibility;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
import android.content.Context;
import android.os.Vibrator;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
/** Controller for "Vibration & haptics" settings page. */
@@ -35,4 +39,11 @@ public class VibrationPreferenceController extends BasePreferenceController {
public int getAvailabilityStatus() {
return mHasVibrator ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public CharSequence getSummary() {
final boolean isVibrateOn = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.VIBRATE_ON, ON) == ON;
return mContext.getText(isVibrateOn ? R.string.switch_on_text : R.string.switch_off_text);
}
}

62
tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
View File

@@ -26,9 +26,14 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.Vibrator;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,10 +45,14 @@ import org.robolectric.RobolectricTestRunner;
public class VibrationPreferenceControllerTest {
private static final String PREFERENCE_KEY = "preference_key";
private static final int OFF = 0;
private static final int ON = 1;
@Mock private Vibrator mVibrator;
@Mock private PreferenceScreen mScreen;
private Context mContext;
private Preference mPreference;
@Before
public void setUp() {
@@ -54,16 +63,14 @@ public class VibrationPreferenceControllerTest {
@Test
public void verifyConstants() {
VibrationPreferenceController controller =
new VibrationPreferenceController(mContext, PREFERENCE_KEY);
VibrationPreferenceController controller = createPreferenceController();
assertThat(controller.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_noVibrator_returnUnsupportedOnDevice() {
when(mVibrator.hasVibrator()).thenReturn(false);
VibrationPreferenceController controller =
new VibrationPreferenceController(mContext, PREFERENCE_KEY);
VibrationPreferenceController controller = createPreferenceController();
assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@@ -71,9 +78,52 @@ public class VibrationPreferenceControllerTest {
@Test
public void getAvailabilityStatus_withVibrator_returnAvailable() {
when(mVibrator.hasVibrator()).thenReturn(true);
VibrationPreferenceController controller =
new VibrationPreferenceController(mContext, PREFERENCE_KEY);
VibrationPreferenceController controller = createPreferenceController();
assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getSummary_vibrateSettingNotSet_returnsOnText() {
when(mVibrator.hasVibrator()).thenReturn(true);
Settings.System.putString(mContext.getContentResolver(), Settings.System.VIBRATE_ON,
/* value= */ null);
VibrationPreferenceController controller = createPreferenceController();
controller.updateState(mPreference);
assertThat(mPreference.getSummary().toString()).isEqualTo(
mContext.getString(R.string.switch_on_text));
}
@Test
public void getSummary_vibrateSettingOn_returnsOnText() {
when(mVibrator.hasVibrator()).thenReturn(true);
Settings.System.putInt(mContext.getContentResolver(), Settings.System.VIBRATE_ON, ON);
VibrationPreferenceController controller = createPreferenceController();
controller.updateState(mPreference);
assertThat(mPreference.getSummary().toString()).isEqualTo(
mContext.getString(R.string.switch_on_text));
}
@Test
public void getSummary_vibrateSettingOff_returnsOffText() {
when(mVibrator.hasVibrator()).thenReturn(true);
Settings.System.putInt(mContext.getContentResolver(), Settings.System.VIBRATE_ON, OFF);
VibrationPreferenceController controller = createPreferenceController();
controller.updateState(mPreference);
assertThat(mPreference.getSummary().toString()).isEqualTo(
mContext.getString(R.string.switch_off_text));
}
private VibrationPreferenceController createPreferenceController() {
VibrationPreferenceController controller =
new VibrationPreferenceController(mContext, PREFERENCE_KEY);
mPreference = new Preference(mContext);
mPreference.setSummary("Test summary");
when(mScreen.findPreference(controller.getPreferenceKey())).thenReturn(mPreference);
controller.displayPreference(mScreen);
return controller;
}
}