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

Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev

Browse Source 
am: d52c4482e4

Change-Id: I2206805a6b9dada11576a6e6667980585acc8472
This commit is contained in:
Doris Ling
2017-09-28 02:05:10 +00:00
committed by android-build-merger
parent f0c328ed78 d52c4482e4
commit eccb0fcff9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/display/BrightnessLevelPreferenceController.java
View File

@@ -34,13 +34,13 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnStop;
import java.text.NumberFormat; import java.text.NumberFormat;
public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
private static final String TAG = "BrightnessPrefCtrl"; private static final String TAG = "BrightnessPrefCtrl";
private static final String KEY_BRIGHTNESS = "brightness"; private static final String KEY_BRIGHTNESS = "brightness";
@@ -113,7 +113,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
} }
@Override @Override
public void onResume() { public void onStart() {
mContentResolver.registerContentObserver(BRIGHTNESS_MODE_URI, false, mBrightnessObserver); mContentResolver.registerContentObserver(BRIGHTNESS_MODE_URI, false, mBrightnessObserver);
mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver); mContentResolver.registerContentObserver(BRIGHTNESS_URI, false, mBrightnessObserver);
mContentResolver.registerContentObserver(BRIGHTNESS_FOR_VR_URI, false, mBrightnessObserver); mContentResolver.registerContentObserver(BRIGHTNESS_FOR_VR_URI, false, mBrightnessObserver);
@@ -121,7 +121,7 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr
} }
@Override @Override
public void onPause() { public void onStop() {
mContentResolver.unregisterContentObserver(mBrightnessObserver); mContentResolver.unregisterContentObserver(mBrightnessObserver);
} }

10
tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
View File

@@ -79,14 +79,14 @@ public class BrightnessLevelPreferenceControllerTest {
} }
@Test @Test
public void onResume_shouldRegisterObserver() { public void onStart_shouldRegisterObserver() {
Context context = RuntimeEnvironment.application; Context context = RuntimeEnvironment.application;
BrightnessLevelPreferenceController controller = BrightnessLevelPreferenceController controller =
new BrightnessLevelPreferenceController(context, null, mPowerManager); new BrightnessLevelPreferenceController(context, null, mPowerManager);
ShadowContentResolver shadowContentResolver = ShadowContentResolver shadowContentResolver =
(ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver()); (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
controller.onResume(); controller.onStart();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isNotEmpty(); System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isNotEmpty();
@@ -99,7 +99,7 @@ public class BrightnessLevelPreferenceControllerTest {
} }
@Test @Test
public void onPause_shouldUnregisterObserver() { public void onStop_shouldUnregisterObserver() {
Context context = RuntimeEnvironment.application; Context context = RuntimeEnvironment.application;
BrightnessLevelPreferenceController controller = BrightnessLevelPreferenceController controller =
new BrightnessLevelPreferenceController(context, null, mPowerManager); new BrightnessLevelPreferenceController(context, null, mPowerManager);
@@ -107,8 +107,8 @@ public class BrightnessLevelPreferenceControllerTest {
(ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver()); (ShadowContentResolver) ShadowExtractor.extract(context.getContentResolver());
controller.displayPreference(mScreen); controller.displayPreference(mScreen);
controller.onResume(); controller.onStart();
controller.onPause(); controller.onStop();
assertThat(shadowContentResolver.getContentObservers( assertThat(shadowContentResolver.getContentObservers(
System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isEmpty(); System.getUriFor(System.SCREEN_BRIGHTNESS_MODE))).isEmpty();