diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index abe5b8ccf354..5015954083c1 100755 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1905,112 +1905,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { final boolean screenshotChordEnabled = mContext.getResources().getBoolean( com.android.internal.R.bool.config_enableScreenshotChord); - if (screenshotChordEnabled) { - mKeyCombinationManager.addRule( - new TwoKeysCombinationRule(KEYCODE_VOLUME_DOWN, KEYCODE_POWER) { - @Override - void execute() { - mPowerKeyHandled = true; - interceptScreenshotChord(); - } - @Override - void cancel() { - cancelPendingScreenshotChordAction(); - } - }); - } - - mKeyCombinationManager.addRule( - new TwoKeysCombinationRule(KEYCODE_VOLUME_DOWN, KEYCODE_VOLUME_UP) { - @Override - boolean preCondition() { - return mAccessibilityShortcutController - .isAccessibilityShortcutAvailable(isKeyguardLocked()); - } - @Override - void execute() { - interceptAccessibilityShortcutChord(); - } - @Override - void cancel() { - cancelPendingAccessibilityShortcutAction(); - } - }); - - // Volume up + power can either be the "ringer toggle chord" or as another way to - // launch GlobalActions. This behavior can change at runtime so we must check behavior - // inside the TwoKeysCombinationRule. - mKeyCombinationManager.addRule( - new TwoKeysCombinationRule(KEYCODE_VOLUME_UP, KEYCODE_POWER) { - @Override - boolean preCondition() { - switch (mPowerVolUpBehavior) { - case POWER_VOLUME_UP_BEHAVIOR_MUTE: - return mRingerToggleChord != VOLUME_HUSH_OFF; - default: - return true; - } - } - @Override - void execute() { - switch (mPowerVolUpBehavior) { - case POWER_VOLUME_UP_BEHAVIOR_MUTE: - // no haptic feedback here since - interceptRingerToggleChord(); - mPowerKeyHandled = true; - break; - case POWER_VOLUME_UP_BEHAVIOR_GLOBAL_ACTIONS: - performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false, - "Power + Volume Up - Global Actions"); - showGlobalActions(); - mPowerKeyHandled = true; - break; - default: - break; - } - } - @Override - void cancel() { - switch (mPowerVolUpBehavior) { - case POWER_VOLUME_UP_BEHAVIOR_MUTE: - cancelPendingRingerToggleChordAction(); - break; - case POWER_VOLUME_UP_BEHAVIOR_GLOBAL_ACTIONS: - cancelGlobalActionsAction(); - break; - } - } - }); - - if (mHasFeatureLeanback) { - mKeyCombinationManager.addRule( - new TwoKeysCombinationRule(KEYCODE_BACK, KEYCODE_DPAD_DOWN) { - @Override - void execute() { - mBackKeyHandled = true; - interceptAccessibilityGestureTv(); - } - - @Override - void cancel() { - cancelAccessibilityGestureTv(); - } - }); - - mKeyCombinationManager.addRule( - new TwoKeysCombinationRule(KEYCODE_DPAD_CENTER, KEYCODE_BACK) { - @Override - void execute() { - mBackKeyHandled = true; - interceptBugreportGestureTv(); - } - - @Override - void cancel() { - cancelBugreportGestureTv(); - } - }); - } } /**