Merge "Device config flag clean up." (54114d78) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/AccessibilitySettings.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.UserHandle;
		import android.provider.DeviceConfig;
		import android.provider.Settings;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		@@ -121,8 +120,6 @@ public class AccessibilitySettings extends DashboardFragment {
		// presentation.
		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 Runnable mUpdateRunnable = new Runnable() {
		@@ -273,11 +270,8 @@ public class AccessibilitySettings extends DashboardFragment {

		@VisibleForTesting
		static boolean isRampingRingerEnabled(final Context context) {
		return (Settings.Global.getInt(
		context.getContentResolver(),
		Settings.Global.APPLY_RAMPING_RINGER, 0) == 1)
		&& DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_TELEPHONY, RAMPING_RINGER_ENABLED, false);
		return Settings.Global.getInt(
		context.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0) == 1;
		}

		private void initializeAllPreferences() {

+1 −12

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.spy;

		import android.content.Context;
		import android.provider.DeviceConfig;
		import android.provider.Settings;
		import android.view.accessibility.AccessibilityManager;

		@@ -72,11 +71,9 @@ public class AccessibilitySettingsTest {

		@Test
		@Config(shadows = {ShadowDeviceConfig.class})
		public void testIsRampingRingerEnabled_bothFlagsOn_Enabled() {
		public void testIsRampingRingerEnabled_settingsFlagOn_Enabled() {
		Settings.Global.putInt(
		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();
		}

		@@ -87,12 +84,4 @@ public class AccessibilitySettingsTest {
		mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0 /* OFF */);
		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();
		}
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -20,10 +20,8 @@ import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.provider.DeviceConfig;
		import android.provider.Settings;

		import com.android.settings.testutils.shadow.ShadowDeviceConfig;
		@@ -54,8 +52,6 @@ public class RingVibrationPreferenceFragmentTest {
		// Turn on both flags to enable ramping ringer.
		Settings.Global.putInt(
		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(
		Settings.Global.APPLY_RAMPING_RINGER);
		}