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

Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17 am: 2611253691

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: I4ae13573dd8858c2f121bbcc859488601eae7c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Silva
2023-05-22 21:52:02 +00:00
committed by Automerger Merge Worker
parent f7e3a2ce45 2611253691
commit 2190ead573
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/dream/DreamHomeControlsPreferenceController.java
View File

@@ -17,6 +17,9 @@
package com.android.settings.dream;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
@@ -46,12 +49,21 @@ public class DreamHomeControlsPreferenceController extends TogglePreferenceContr
final boolean supported =
mBackend.getSupportedComplications()
.contains(DreamBackend.COMPLICATION_TYPE_HOME_CONTROLS);
return supported ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
return controlsEnabledOnLockscreen() ? (supported ? AVAILABLE : CONDITIONALLY_UNAVAILABLE)
: DISABLED_DEPENDENT_SETTING;
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
preference.setEnabled(getAvailabilityStatus() == AVAILABLE);
refreshSummary(preference);
}
@Override
public boolean isChecked() {
return mBackend.getEnabledComplications().contains(
return controlsEnabledOnLockscreen() && mBackend.getEnabledComplications().contains(
DreamBackend.COMPLICATION_TYPE_HOME_CONTROLS);
}
@@ -61,6 +73,12 @@ public class DreamHomeControlsPreferenceController extends TogglePreferenceContr
return true;
}
private boolean controlsEnabledOnLockscreen() {
return Settings.Secure.getInt(
mContext.getContentResolver(),
Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 0) != 0;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;

21
tests/robotests/src/com/android/settings/dream/DreamHomeControlsPreferenceControllerTest.java
View File

@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
import android.util.ArraySet;
import androidx.preference.PreferenceScreen;
@@ -80,6 +81,7 @@ public class DreamHomeControlsPreferenceControllerTest {
@Test
public void testSetChecked_setTrue_enablesSetting() {
setControlsEnabledOnLockscreen(true);
mBackend.setHomeControlsEnabled(false);
assertThat(mBackend.getEnabledComplications())
.doesNotContain(COMPLICATION_TYPE_HOME_CONTROLS);
@@ -91,6 +93,7 @@ public class DreamHomeControlsPreferenceControllerTest {
@Test
public void testSetChecked_setFalse_disablesSetting() {
setControlsEnabledOnLockscreen(true);
mBackend.setHomeControlsEnabled(true);
assertThat(mBackend.getEnabledComplications())
.contains(COMPLICATION_TYPE_HOME_CONTROLS);
@@ -102,15 +105,33 @@ public class DreamHomeControlsPreferenceControllerTest {
@Test
public void testIsChecked_returnsFalse() {
setControlsEnabledOnLockscreen(true);
mBackend.setHomeControlsEnabled(false);
assertThat(mController.isChecked()).isFalse();
}
@Test
public void testIsChecked_returnsTrue() {
setControlsEnabledOnLockscreen(true);
mBackend.setHomeControlsEnabled(true);
assertThat(mBackend.getEnabledComplications())
.contains(COMPLICATION_TYPE_HOME_CONTROLS);
assertThat(mController.isChecked()).isTrue();
}
@Test
public void testIsChecked_lockScreenDisabled_returnsFalse() {
setControlsEnabledOnLockscreen(false);
mBackend.setHomeControlsEnabled(true);
assertThat(mBackend.getEnabledComplications())
.doesNotContain(COMPLICATION_TYPE_HOME_CONTROLS);
assertThat(mController.isChecked()).isFalse();
}
private void setControlsEnabledOnLockscreen(boolean enabled) {
Settings.Secure.putInt(
mContext.getContentResolver(),
Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,
enabled ? 1 : 0);
}
}