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

Update power button gesture menu

Browse Source 
This renames the menut to fit within other gesture options. It also properly implements subtitle behaviour in gesture menu and adds a hint on how to invoke the power menu on new Pixels.

Bug:191899039
Bug:168176408
Bug:189506870
Test:  Unit tests for package com.android.setttings.gestures.*
       Manually on device

Change-Id: I985a97514ca142d554ab2aafd61a6219cc1a3dd6
This commit is contained in:
Jernej Virag
2021-06-24 15:23:16 +00:00
parent 17608ff21a
commit 34cbca502b
6 changed files with 227 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/gestures/PowerMenuPreferenceController.java
View File

@@ -17,28 +17,54 @@
package com.android.settings.gestures;
import android.content.Context;
import android.provider.Settings;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class PowerMenuPreferenceController extends BasePreferenceController {
private static final String POWER_BUTTON_LONG_PRESS_SETTING =
Settings.Global.POWER_BUTTON_LONG_PRESS;
@VisibleForTesting
static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
@VisibleForTesting
static final int LONG_PRESS_POWER_ASSISTANT_VALUE = 5;
public PowerMenuPreferenceController(Context context, String key) {
super(context, key);
}
@Override
public CharSequence getSummary() {
return mContext.getText(R.string.power_menu_long_press_for_assist);
final int powerButtonValue = getPowerButtonLongPressValue(mContext);
if (powerButtonValue == LONG_PRESS_POWER_ASSISTANT_VALUE) {
return mContext.getText(R.string.power_menu_summary_long_press_for_assist_enabled);
} else if (powerButtonValue == LONG_PRESS_POWER_GLOBAL_ACTIONS) {
return mContext.getText(
R.string.power_menu_summary_long_press_for_assist_disabled_with_power_menu);
} else {
return mContext.getText(
R.string.power_menu_summary_long_press_for_assist_disabled_no_action);
}
}
@Override
public int getAvailabilityStatus() {
return isAssistInvocationAvailable() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
return isAssistInvocationAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
private boolean isAssistInvocationAvailable() {
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable);
}
private static int getPowerButtonLongPressValue(Context context) {
return Settings.Global.getInt(context.getContentResolver(),
POWER_BUTTON_LONG_PRESS_SETTING,
context.getResources().getInteger(
com.android.internal.R.integer.config_longPressOnPowerBehavior));
}
}