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

Add summary to PreventRingingParent

Browse Source 
Parent preference previously didn't have a summary
Moved summary test to PreventRingingParentPreferenceControllerTest

Test: PreventRingingParentPreferenceControllerTest.java
Change-Id: I2891e1ccffc4ea8007c8bd25689f242ee34c652c
This commit is contained in:
Beverly
2018-06-07 10:43:47 -04:00
parent ddd9283ee0
commit 756e3b6caf
4 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
View File

@@ -16,12 +16,20 @@
package com.android.settings.gestures;
import android.content.Context;
import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE;
import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE;
import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class PreventRingingParentPreferenceController extends BasePreferenceController {
final String SECURE_KEY = VOLUME_HUSH_GESTURE;
public PreventRingingParentPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -33,4 +41,21 @@ public class PreventRingingParentPreferenceController extends BasePreferenceCont
? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public CharSequence getSummary() {
int value = Settings.Secure.getInt(
mContext.getContentResolver(), SECURE_KEY, VOLUME_HUSH_VIBRATE);
int summary;
switch (value) {
case VOLUME_HUSH_VIBRATE:
summary = R.string.prevent_ringing_option_vibrate_summary;
break;
case VOLUME_HUSH_MUTE:
summary = R.string.prevent_ringing_option_mute_summary;
break;
default:
summary = R.string.prevent_ringing_option_none_summary;
}
return mContext.getText(summary);
}
}

20
src/com/android/settings/gestures/PreventRingingPreferenceController.java
View File

@@ -50,8 +50,6 @@ public class PreventRingingPreferenceController extends PreventRingingParentPref
@VisibleForTesting
boolean mVideoPaused;
private final String SECURE_KEY = VOLUME_HUSH_GESTURE;
public PreventRingingPreferenceController(Context context, String key) {
super(context, key);
}
@@ -95,24 +93,6 @@ public class PreventRingingPreferenceController extends PreventRingingParentPref
}
}
@Override
public CharSequence getSummary() {
int value = Settings.Secure.getInt(
mContext.getContentResolver(), SECURE_KEY, VOLUME_HUSH_VIBRATE);
int summary;
switch (value) {
case VOLUME_HUSH_VIBRATE:
summary = R.string.prevent_ringing_option_vibrate_summary;
break;
case VOLUME_HUSH_MUTE:
summary = R.string.prevent_ringing_option_mute_summary;
break;
default:
summary = R.string.prevent_ringing_option_none_summary;
}
return mContext.getString(summary);
}
@Override
public void onCreate(Bundle savedInstanceState) {
if (savedInstanceState != null) {

38
tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
View File

@@ -16,14 +16,25 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE;
import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE;
import static android.provider.Settings.Secure.VOLUME_HUSH_OFF;
import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -41,18 +52,20 @@ public class PreventRingingParentPreferenceControllerTest {
private Context mContext;
private PreventRingingParentPreferenceController mController;
private final String VIBRATE_SUMMARY = "On (vibrate)";
private final String MUTE_SUMMARY = "On (mute)";
private final String NONE_SUMMARY = "Off";
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getResources()).thenReturn(mResources);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
mController = new PreventRingingParentPreferenceController(mContext, "test_key");
}
@Test
public void testIsAvailable_configIsTrue_shouldAvailableUnSearchable() {
when(mContext.getResources()).thenReturn(mResources);
when(mResources.getBoolean(
com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(true);
@@ -61,9 +74,28 @@ public class PreventRingingParentPreferenceControllerTest {
@Test
public void testIsAvailable_configIsFalse_shouldReturnFalse() {
when(mContext.getResources()).thenReturn(mResources);
when(mResources.getBoolean(
com.android.internal.R.bool.config_volumeHushGestureEnabled)).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void updateState_summaryUpdated() {
Settings.Secure.putInt(mContext.getContentResolver(), VOLUME_HUSH_GESTURE,
VOLUME_HUSH_MUTE);
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getText(
R.string.prevent_ringing_option_mute_summary));
Settings.Secure.putInt(mContext.getContentResolver(), VOLUME_HUSH_GESTURE,
VOLUME_HUSH_VIBRATE);
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getText(
R.string.prevent_ringing_option_vibrate_summary));
Settings.Secure.putInt(mContext.getContentResolver(), VOLUME_HUSH_GESTURE,
VOLUME_HUSH_OFF);
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getText(
R.string.prevent_ringing_option_none_summary));
}
}

23
tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
View File

@@ -87,29 +87,6 @@ public class PreventRingingPreferenceControllerTest {
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void testGetSummary_mute() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
Settings.Secure.VOLUME_HUSH_MUTE);
assertEquals(mContext.getString(R.string.prevent_ringing_option_mute_summary),
mController.getSummary());
}
@Test
public void testGetSummary_vibrate() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
Settings.Secure.VOLUME_HUSH_VIBRATE);
assertEquals(mContext.getString(R.string.prevent_ringing_option_vibrate_summary),
mController.getSummary());
}
@Test
public void testGetSummary_other() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.VOLUME_HUSH_GESTURE,
7);
assertEquals(mContext.getString(R.string.prevent_ringing_option_none_summary),
mController.getSummary());
}
@Test
public void testUpdateState_mute() {
ListPreference pref = mock(ListPreference.class);