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

Update Prevent Ringing setting to avoid conflict with long press power

Browse Source 
Long press power setting overrides Prevent ringing setting key chord. This updates the Prevent Ringing setting to disable it when LPP setting conflicts and adds a string describing why this setting is disabled.

Bug: 191971326
Test: Manually on device
      Unit tests in PreventRingingParentPreferenceController
Change-Id: If9fc8318381def7e4bbd71a0f5db3f38c474cb3d
This commit is contained in:
Jernej Virag
2021-07-01 15:35:56 +00:00
parent f421525d2c
commit bb75bb911e
3 changed files with 125 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
View File

@@ -37,10 +37,15 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.google.common.annotations.VisibleForTesting;
/** The controller manages the behaviour of the Prevent Ringing gesture setting. */
public class PreventRingingParentPreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnStart, OnStop {
@VisibleForTesting
static final int KEY_CHORD_POWER_VOLUME_UP_MUTE_TOGGLE = 1;
final String SECURE_KEY = VOLUME_HUSH_GESTURE;
private PrimarySwitchPreference mPreference;
@@ -59,6 +64,10 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo
@Override
public boolean isChecked() {
if (!isVolumePowerKeyChordSetToHush()) {
return false;
}
final int preventRinging = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.VOLUME_HUSH_GESTURE,
Settings.Secure.VOLUME_HUSH_VIBRATE);
@@ -85,25 +94,47 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo
final int value = Settings.Secure.getInt(
mContext.getContentResolver(), SECURE_KEY, VOLUME_HUSH_VIBRATE);
CharSequence summary;
switch (value) {
case VOLUME_HUSH_VIBRATE:
summary = mContext.getText(R.string.prevent_ringing_option_vibrate_summary);
break;
case VOLUME_HUSH_MUTE:
summary = mContext.getText(R.string.prevent_ringing_option_mute_summary);
break;
// VOLUME_HUSH_OFF
default:
summary = mContext.getText(R.string.switch_off_text);
if (isVolumePowerKeyChordSetToHush()) {
switch (value) {
case VOLUME_HUSH_VIBRATE:
summary = mContext.getText(R.string.prevent_ringing_option_vibrate_summary);
break;
case VOLUME_HUSH_MUTE:
summary = mContext.getText(R.string.prevent_ringing_option_mute_summary);
break;
// VOLUME_HUSH_OFF
default:
summary = mContext.getText(R.string.switch_off_text);
}
preference.setEnabled(true);
mPreference.setSwitchEnabled(true);
} else {
summary = mContext.getText(R.string.prevent_ringing_option_unavailable_lpp_summary);
preference.setEnabled(false);
mPreference.setSwitchEnabled(false);
}
preference.setSummary(summary);
}
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_volumeHushGestureEnabled)
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
if (!mContext.getResources().getBoolean(
com.android.internal.R.bool.config_volumeHushGestureEnabled)) {
return UNSUPPORTED_ON_DEVICE;
}
if (isVolumePowerKeyChordSetToHush()) {
return AVAILABLE;
}
if (mContext.getResources().getBoolean(
com.android.internal
.R.bool.config_longPressOnPowerForAssistantSettingAvailable)) {
// The power + volume key chord is not set to hush gesture - it's been disabled
// by long press power for Assistant.
return DISABLED_DEPENDENT_SETTING;
}
return UNSUPPORTED_ON_DEVICE;
}
@Override
@@ -121,9 +152,26 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo
}
}
/**
* Returns true if power + volume up key chord is actually set to "mute toggle". If not,
* this setting will have no effect and should be disabled.
*
* This handles the condition when long press on power for Assistant changes power + volume
* chord to power menu and this setting needs to be disabled.
*/
private boolean isVolumePowerKeyChordSetToHush() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.KEY_CHORD_POWER_VOLUME_UP,
mContext.getResources().getInteger(
com.android.internal.R.integer.config_keyChordPowerVolumeUp))
== KEY_CHORD_POWER_VOLUME_UP_MUTE_TOGGLE;
}
private class SettingObserver extends ContentObserver {
private final Uri mVolumeHushGestureUri = Settings.Secure.getUriFor(
Settings.Secure.VOLUME_HUSH_GESTURE);
private final Uri mKeyChordVolumePowerUpUri = Settings.Global.getUriFor(
Settings.Global.KEY_CHORD_POWER_VOLUME_UP);
private final Preference mPreference;
@@ -133,6 +181,7 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo
}
public void register(ContentResolver cr) {
cr.registerContentObserver(mKeyChordVolumePowerUpUri, false, this);
cr.registerContentObserver(mVolumeHushGestureUri, false, this);
}
@@ -143,7 +192,8 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo
@Override
public void onChange(boolean selfChange, Uri uri) {
super.onChange(selfChange, uri);
if (uri == null || mVolumeHushGestureUri.equals(uri)) {
if (uri == null || mVolumeHushGestureUri.equals(uri)
|| mKeyChordVolumePowerUpUri.equals(uri)) {
updateState(mPreference);
}
}