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

Device config flag clean up.

Browse Source 
Test: built and tested on device
Change-Id: I4e64cceca629c0b4c0a5d0a5ec23bc2d75f4aead
This commit is contained in:
Yiwen Chen
2020-02-05 16:13:11 -08:00
parent 105624cf14
commit 950023fc36
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.DeviceConfig;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -121,8 +120,6 @@ public class AccessibilitySettings extends DashboardFragment {
// presentation. // presentation.
private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000; private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
static final String RAMPING_RINGER_ENABLED = "ramping_ringer_enabled";
private final Handler mHandler = new Handler(); private final Handler mHandler = new Handler();
private final Runnable mUpdateRunnable = new Runnable() { private final Runnable mUpdateRunnable = new Runnable() {
@@ -273,11 +270,8 @@ public class AccessibilitySettings extends DashboardFragment {
@VisibleForTesting @VisibleForTesting
static boolean isRampingRingerEnabled(final Context context) { static boolean isRampingRingerEnabled(final Context context) {
return (Settings.Global.getInt( return Settings.Global.getInt(
context.getContentResolver(), context.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0) == 1;
Settings.Global.APPLY_RAMPING_RINGER, 0) == 1)
&& DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_TELEPHONY, RAMPING_RINGER_ENABLED, false);
} }
private void initializeAllPreferences() { private void initializeAllPreferences() {

13
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -22,7 +22,6 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import android.content.Context; import android.content.Context;
import android.provider.DeviceConfig;
import android.provider.Settings; import android.provider.Settings;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
@@ -72,11 +71,9 @@ public class AccessibilitySettingsTest {
@Test @Test
@Config(shadows = {ShadowDeviceConfig.class}) @Config(shadows = {ShadowDeviceConfig.class})
public void testIsRampingRingerEnabled_bothFlagsOn_Enabled() { public void testIsRampingRingerEnabled_settingsFlagOn_Enabled() {
Settings.Global.putInt( Settings.Global.putInt(
mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 1 /* ON */); mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 1 /* ON */);
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
AccessibilitySettings.RAMPING_RINGER_ENABLED, "true", false /* makeDefault*/);
assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isTrue(); assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isTrue();
} }
@@ -87,12 +84,4 @@ public class AccessibilitySettingsTest {
mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0 /* OFF */); mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0 /* OFF */);
assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse(); assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
} }
@Test
@Config(shadows = {ShadowDeviceConfig.class})
public void testIsRampingRingerEnabled_deviceConfigFlagOff_Disabled() {
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
AccessibilitySettings.RAMPING_RINGER_ENABLED, "false", false /* makeDefault*/);
assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
}
} }

4
tests/robotests/src/com/android/settings/accessibility/RingVibrationPreferenceFragmentTest.java
View File

@@ -20,10 +20,8 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.provider.DeviceConfig;
import android.provider.Settings; import android.provider.Settings;
import com.android.settings.testutils.shadow.ShadowDeviceConfig; import com.android.settings.testutils.shadow.ShadowDeviceConfig;
@@ -54,8 +52,6 @@ public class RingVibrationPreferenceFragmentTest {
// Turn on both flags to enable ramping ringer. // Turn on both flags to enable ramping ringer.
Settings.Global.putInt( Settings.Global.putInt(
mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 1 /* ON */); mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 1 /* ON */);
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
AccessibilitySettings.RAMPING_RINGER_ENABLED, "true", false /* makeDefault*/);
assertThat(mFragment.getVibrationEnabledSetting()).isEqualTo( assertThat(mFragment.getVibrationEnabledSetting()).isEqualTo(
Settings.Global.APPLY_RAMPING_RINGER); Settings.Global.APPLY_RAMPING_RINGER);
} }