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

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

Change-Id: Ibd8e11b0cd11ff6ecb17a5b71ae8895e850d5b12
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:04:21 +00:00
committed by Automerger Merge Worker
parent b5d3fc5b53 5bce93eb17
commit 975b03405f
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;