Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev am: d9ba2df119
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836011 Change-Id: I9a03f509116603c2286b2c385af4587bd8dd9b09
This commit is contained in:
@@ -124,7 +124,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
|
||||
Intent intent = new Intent(Intent.ACTION_VOICE_COMMAND);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
try {
|
||||
sendCloseSystemWindows();
|
||||
mContext.startActivity(intent);
|
||||
} catch (ActivityNotFoundException e) {
|
||||
startCallActivity();
|
||||
@@ -147,7 +146,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
|
||||
dispatcher.performedLongPress(event);
|
||||
if (isUserSetupComplete()) {
|
||||
mView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
|
||||
sendCloseSystemWindows();
|
||||
// Broadcast an intent that the Camera button was longpressed
|
||||
Intent intent = new Intent(Intent.ACTION_CAMERA_BUTTON, null);
|
||||
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
|
||||
@@ -178,7 +176,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
try {
|
||||
mView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
|
||||
sendCloseSystemWindows();
|
||||
getSearchManager().stopSearch();
|
||||
mContext.startActivity(intent);
|
||||
// Only clear this if we successfully start the
|
||||
@@ -272,7 +269,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
|
||||
|
||||
@UnsupportedAppUsage
|
||||
void startCallActivity() {
|
||||
sendCloseSystemWindows();
|
||||
Intent intent = new Intent(Intent.ACTION_CALL_BUTTON);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
try {
|
||||
@@ -319,10 +315,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
|
||||
return mMediaSessionManager;
|
||||
}
|
||||
|
||||
void sendCloseSystemWindows() {
|
||||
PhoneWindow.sendCloseSystemWindows(mContext, null);
|
||||
}
|
||||
|
||||
private void handleVolumeKeyEvent(KeyEvent keyEvent) {
|
||||
getMediaSessionManager().dispatchVolumeKeyEventAsSystemService(keyEvent,
|
||||
AudioManager.USE_DEFAULT_STREAM_TYPE);
|
||||
|
||||
Reference in New Issue
Block a user