release-request-ca7a0f27-e01e-4493-95dc-73b265f88cc9-for-git_oc-mr1-release-43... (6c54f2fc) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/development/CameraHalHdrplusPreferenceController.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -63,9 +63,7 @@ public class CameraHalHdrplusPreferenceController extends AbstractPreferenceCont

		@Override
		public boolean isAvailable() {
		return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus) &&
		(SystemProperties.get(BUILD_TYPE).equals("userdebug") \|\|
		SystemProperties.get(BUILD_TYPE).equals("eng"));
		return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);
		}

		@Override

src/com/android/settings/display/BrightnessLevelPreferenceController.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -34,13 +34,13 @@ import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnPause;
		import com.android.settingslib.core.lifecycle.events.OnResume;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		import com.android.settingslib.core.lifecycle.events.OnStop;

		import java.text.NumberFormat;

		public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements
		PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
		PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {

		private static final String TAG = "BrightnessPrefCtrl";
		private static final String KEY_BRIGHTNESS = "brightness";
		@@ -113,7 +113,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
		}

		@Override
		public void onResume() {
		public void onStart() {
		mContentResolver.registerContentObserver(BRIGHTNESS_MODE_URI, false, mBrightnessObserver);
		mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);
		mContentResolver.registerContentObserver(BRIGHTNESS_FOR_VR_URI, false, mBrightnessObserver);
		@@ -121,7 +121,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
		}

		@Override
		public void onPause() {
		public void onStop() {
		mContentResolver.unregisterContentObserver(mBrightnessObserver);
		}

src/com/android/settings/fuelgauge/PowerUsageAdvanced.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		return usageType == UsageType.CELL
		\|\| usageType == UsageType.BLUETOOTH
		\|\| usageType == UsageType.WIFI
		\|\| usageType == UsageType.APP;
		\|\| usageType == UsageType.APP
		\|\| usageType == UsageType.SYSTEM;
		}

		@VisibleForTesting

tests/robotests/src/com/android/settings/development/CameraHalHdrplusPreferenceControllerTest.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -53,8 +53,6 @@ public class CameraHalHdrplusPreferenceControllerTest {
		private SwitchPreference mPreference;

		static final String USERDEBUG_BUILD = "userdebug";
		static final String ENG_BUILD = "eng";
		static final String USER_BUILD = "user";

		private CameraHalHdrplusPreferenceController mController;

		@@ -78,39 +76,6 @@ public class CameraHalHdrplusPreferenceControllerTest {
		assertThat(mController.isAvailable()).isFalse();
		}

		@Test
		public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
		when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
		.thenReturn(true);

		SettingsShadowSystemProperties.set(
		CameraHalHdrplusPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);

		assertThat(mController.isAvailable()).isTrue();
		}

		@Test
		public void isAvailable_withEngBuild_shouldReturnTrue() {
		when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
		.thenReturn(true);

		SettingsShadowSystemProperties.set(
		CameraHalHdrplusPreferenceController.BUILD_TYPE, ENG_BUILD);

		assertThat(mController.isAvailable()).isTrue();
		}

		@Test
		public void isAvailable_withUserBuild_shouldReturnFalse() {
		when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))
		.thenReturn(true);

		SettingsShadowSystemProperties.set(
		CameraHalHdrplusPreferenceController.BUILD_TYPE, USER_BUILD);

		assertThat(mController.isAvailable()).isFalse();
		}

		@Test
		public void displayPreference_cameraHalHdrplusEnabled_shouldCheckedPreference() {
		when(mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus))

tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -79,14 +79,14 @@ public class BrightnessLevelPreferenceControllerTest {
		}

		@Test
		public void onResume_shouldRegisterObserver() {
		public void onStart_shouldRegisterObserver() {
		Context context = RuntimeEnvironment.application;
		BrightnessLevelPreferenceController controller =
		new BrightnessLevelPreferenceController(context, null, mPowerManager);
		ShadowContentResolver shadowContentResolver =
		(ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());

		controller.onResume();
		controller.onStart();

		assertThat(shadowContentResolver.getContentObservers(
		System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isNotEmpty();
		@@ -99,7 +99,7 @@ public class BrightnessLevelPreferenceControllerTest {
		}

		@Test
		public void onPause_shouldUnregisterObserver() {
		public void onStop_shouldUnregisterObserver() {
		Context context = RuntimeEnvironment.application;
		BrightnessLevelPreferenceController controller =
		new BrightnessLevelPreferenceController(context, null, mPowerManager);
		@@ -107,8 +107,8 @@ public class BrightnessLevelPreferenceControllerTest {
		(ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());

		controller.displayPreference(mScreen);
		controller.onResume();
		controller.onPause();
		controller.onStart();
		controller.onStop();

		assertThat(shadowContentResolver.getContentObservers(
		System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isEmpty();