From 88a773892b8f0b15415d849822121f6273cd16cd Mon Sep 17 00:00:00 2001 From: Abel Tesfaye Date: Tue, 4 May 2021 21:07:44 +0000 Subject: [PATCH] Add warning message when power save mode is enabled for smart auto rotate settings fragment Test: locally with flame, make RunSettingsRoboTests -j96 ROBOTEST_FILTER=SmartAutoRotateBatterySaverControllerTest,SmartAutoRotateControllerTest Bug: 186690152 Change-Id: Ibac90a4edd4631e8256da79d0594ac7704b5f8f7 --- res/values/strings.xml | 3 + res/xml/auto_rotate_settings.xml | 5 + ...SmartAutoRotateBatterySaverController.java | 96 +++++++++++++++++++ .../display/SmartAutoRotateController.java | 40 +++++++- .../SmartAutoRotatePreferenceFragment.java | 6 +- ...tAutoRotateBatterySaverControllerTest.java | 80 ++++++++++++++++ .../SmartAutoRotateControllerTest.java | 9 +- 7 files changed, 232 insertions(+), 7 deletions(-) create mode 100644 src/com/android/settings/display/SmartAutoRotateBatterySaverController.java create mode 100644 tests/robotests/src/com/android/settings/display/SmartAutoRotateBatterySaverControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index ac239f61c96..f90f4496801 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11357,6 +11357,9 @@ Temporarily disabled due to Battery Saver + + Temporarily disabled due to Battery Saver + Temporarily turned on due to Battery Saver diff --git a/res/xml/auto_rotate_settings.xml b/res/xml/auto_rotate_settings.xml index bc47b81d0be..f11c0ba2254 100644 --- a/res/xml/auto_rotate_settings.xml +++ b/res/xml/auto_rotate_settings.xml @@ -32,6 +32,11 @@ android:summary="@string/auto_rotate_camera_lock_summary" settings:controller="com.android.settings.display.SmartAutoRotateCameraStateController" /> + + { + mPowerManager.setPowerSaveModeEnabled(false); + }); + } + + @Override + public void onStart() { + mContext.registerReceiver(mReceiver, + new IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED)); + } + + @Override + public void onStop() { + mContext.unregisterReceiver(mReceiver); + } + + @Override + @AvailabilityStatus + public int getAvailabilityStatus() { + return isRotationResolverServiceAvailable(mContext) + && isPowerSaveMode() ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; + } +} diff --git a/src/com/android/settings/display/SmartAutoRotateController.java b/src/com/android/settings/display/SmartAutoRotateController.java index cf2a9a60567..90b0d55efc8 100644 --- a/src/com/android/settings/display/SmartAutoRotateController.java +++ b/src/com/android/settings/display/SmartAutoRotateController.java @@ -20,15 +20,19 @@ import static android.provider.Settings.Secure.CAMERA_AUTOROTATE; import android.Manifest; import android.app.settings.SettingsEnums; +import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.hardware.SensorPrivacyManager; +import android.os.PowerManager; import android.provider.Settings; import android.service.rotationresolver.RotationResolverService; import android.text.TextUtils; +import androidx.lifecycle.LifecycleObserver; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -37,15 +41,24 @@ import com.android.internal.view.RotationPolicy; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.core.lifecycle.events.OnStart; +import com.android.settingslib.core.lifecycle.events.OnStop; /** * SmartAutoRotateController controls whether auto rotation is enabled */ public class SmartAutoRotateController extends TogglePreferenceController implements - Preference.OnPreferenceChangeListener { + Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop { private final MetricsFeatureProvider mMetricsFeatureProvider; private final SensorPrivacyManager mPrivacyManager; + private final PowerManager mPowerManager; + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + updateState(mPreference); + } + }; private Preference mPreference; public SmartAutoRotateController(Context context, String preferenceKey) { @@ -54,6 +67,7 @@ public class SmartAutoRotateController extends TogglePreferenceController implem mPrivacyManager = SensorPrivacyManager.getInstance(context); mPrivacyManager .addSensorPrivacyListener(CAMERA, (sensor, enabled) -> updateState(mPreference)); + mPowerManager = context.getSystemService(PowerManager.class); } @Override @@ -62,7 +76,7 @@ public class SmartAutoRotateController extends TogglePreferenceController implem return UNSUPPORTED_ON_DEVICE; } return !RotationPolicy.isRotationLocked(mContext) && hasSufficientPermission(mContext) - && !isCameraLocked() ? AVAILABLE : DISABLED_DEPENDENT_SETTING; + && !isCameraLocked() && !isPowerSaveMode() ? AVAILABLE : DISABLED_DEPENDENT_SETTING; } @Override @@ -82,11 +96,27 @@ public class SmartAutoRotateController extends TogglePreferenceController implem return mPrivacyManager.isSensorPrivacyEnabled(SensorPrivacyManager.Sensors.CAMERA); } + @VisibleForTesting + boolean isPowerSaveMode() { + return mPowerManager.isPowerSaveMode(); + } + + @Override + public void onStart() { + mContext.registerReceiver(mReceiver, + new IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED)); + } + + @Override + public void onStop() { + mContext.unregisterReceiver(mReceiver); + } + @Override public boolean isChecked() { - return hasSufficientPermission(mContext) && !isCameraLocked() && Settings.Secure.getInt( - mContext.getContentResolver(), - CAMERA_AUTOROTATE, 0) == 1; + return hasSufficientPermission(mContext) && !isCameraLocked() && !isPowerSaveMode() + && Settings.Secure.getInt(mContext.getContentResolver(), + CAMERA_AUTOROTATE, 0) == 1; } @Override diff --git a/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java b/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java index 1a91775c408..f697a8c7c48 100644 --- a/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java +++ b/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java @@ -21,6 +21,7 @@ import static com.android.settings.display.SmartAutoRotateController.isRotationR import android.app.settings.SettingsEnums; import android.hardware.SensorPrivacyManager; import android.os.Bundle; +import android.os.PowerManager; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -50,6 +51,7 @@ public class SmartAutoRotatePreferenceFragment extends DashboardFragment { private RotationPolicy.RotationPolicyListener mRotationPolicyListener; private SensorPrivacyManager mPrivacyManager; private AutoRotateSwitchBarController mSwitchBarController; + private PowerManager mPowerManager; private static final String FACE_SWITCH_PREFERENCE_ID = "face_based_rotate"; @Override @@ -69,6 +71,7 @@ public class SmartAutoRotatePreferenceFragment extends DashboardFragment { mSwitchBarController = new AutoRotateSwitchBarController(activity, switchBar, getSettingsLifecycle()); mPrivacyManager = SensorPrivacyManager.getInstance(activity); + mPowerManager = getSystemService(PowerManager.class); final Preference footerPreference = findPreference(FooterPreference.KEY_FOOTER); if (footerPreference != null) { footerPreference.setTitle(Html.fromHtml(getString(R.string.smart_rotate_text_headline), @@ -89,9 +92,10 @@ public class SmartAutoRotatePreferenceFragment extends DashboardFragment { final boolean isLocked = RotationPolicy.isRotationLocked(getContext()); final boolean isCameraLocked = mPrivacyManager.isSensorPrivacyEnabled( SensorPrivacyManager.Sensors.CAMERA); + final boolean isBatterySaver = mPowerManager.isPowerSaveMode(); final Preference preference = findPreference(FACE_SWITCH_PREFERENCE_ID); if (preference != null && hasSufficientPermission(getContext())) { - preference.setEnabled(!isLocked && !isCameraLocked); + preference.setEnabled(!isLocked && !isCameraLocked && !isBatterySaver); } } }; diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotateBatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotateBatterySaverControllerTest.java new file mode 100644 index 00000000000..86f1d8839d2 --- /dev/null +++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotateBatterySaverControllerTest.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.display; + +import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.when; + +import android.content.ContentResolver; +import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.content.pm.ServiceInfo; + +import com.android.settings.testutils.ResolveInfoBuilder; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class SmartAutoRotateBatterySaverControllerTest { + + private static final String PACKAGE_NAME = "package_name"; + + private SmartAutoRotateBatterySaverController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + final Context context = Mockito.spy(RuntimeEnvironment.application); + final ContentResolver contentResolver = RuntimeEnvironment.application.getContentResolver(); + when(context.getContentResolver()).thenReturn(contentResolver); + final PackageManager packageManager = Mockito.mock(PackageManager.class); + when(context.getPackageManager()).thenReturn(packageManager); + doReturn(PACKAGE_NAME).when(packageManager).getRotationResolverPackageName(); + mController = Mockito.spy( + new SmartAutoRotateBatterySaverController(context, "smart_auto_rotate")); + when(mController.isPowerSaveMode()).thenReturn(false); + + final ResolveInfo resolveInfo = new ResolveInfoBuilder(PACKAGE_NAME).build(); + resolveInfo.serviceInfo = new ServiceInfo(); + when(packageManager.resolveService(any(), anyInt())).thenReturn(resolveInfo); + } + + @Test + public void getAvailabilityStatus_returnUnsupportedOnDevice() { + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); + } + + @Test + public void getAvailabilityStatus_powerSaveModeEnabled_returnAvailableUnSearchAble() { + when(mController.isPowerSaveMode()).thenReturn(true); + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); + } +} diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java index a65d8806f77..778721a163c 100644 --- a/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotateControllerTest.java @@ -74,8 +74,9 @@ public class SmartAutoRotateControllerTest { doReturn(PACKAGE_NAME).when(mPackageManager).getRotationResolverPackageName(); doReturn(PackageManager.PERMISSION_GRANTED).when(mPackageManager).checkPermission( Manifest.permission.CAMERA, PACKAGE_NAME); - mController = new SmartAutoRotateController(context, "test_key"); + mController = Mockito.spy(new SmartAutoRotateController(context, "test_key")); when(mController.isCameraLocked()).thenReturn(false); + when(mController.isPowerSaveMode()).thenReturn(false); doReturn(mController.getPreferenceKey()).when(mPreference).getKey(); final ResolveInfo resolveInfo = new ResolveInfoBuilder(PACKAGE_NAME).build(); @@ -115,6 +116,12 @@ public class SmartAutoRotateControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING); } + @Test + public void getAvailabilityStatus_powerSaveEnabled_returnDisableDependentSetting() { + when(mController.isPowerSaveMode()).thenReturn(true); + assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING); + } + private void enableAutoRotation() { Settings.System.putIntForUser(mContentResolver, Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT);