summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2020-06-11 00:19:19 +0000
committer Matt Casey <mrcasey@google.com> 2020-06-11 00:20:16 +0000
commit02805f050bc8d754a4e26d8eb24950b857b493c2 (patch)
tree3377a073b2647624c7844d4a730adc886863259c
parentd56eaf68f6524a42594758feb20dc68f9920c33c (diff)
Revert "Hide bubbles' IME after screenshot is taken."
This reverts commit d56eaf68f6524a42594758feb20dc68f9920c33c. Reason for revert: Causing a sysui crash Bug: 157756391 Change-Id: I9df1bf4a3e9e6cb2f03218ba3c56c7c5660483c7
-rw-r--r--packages/SystemUI/AndroidManifest.xml4
-rw-r--r--packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java19
2 files changed, 0 insertions, 23 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index ef3e799a55bf..985269b2bb75 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -406,10 +406,6 @@
<receiver android:name=".screenshot.GlobalScreenshot$SmartActionsReceiver"
android:exported="false"/>
- <!-- Callback for performing sysui cleanup after screenshot has been taken. -->
- <receiver android:name=".screenshot.GlobalScreenshot$ScreenshotTakenReceiver"
- android:exported="false"/>
-
<!-- started from UsbDeviceSettingsManager -->
<activity android:name=".usb.UsbConfirmActivity"
android:exported="true"
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index 3368e72e7666..a624479fa63c 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@ -83,7 +83,6 @@ import android.widget.Toast;
import com.android.internal.logging.UiEventLogger;
import com.android.systemui.R;
-import com.android.systemui.bubbles.BubbleController;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.statusbar.phone.StatusBar;
@@ -473,8 +472,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
return;
}
- mContext.sendBroadcast(new Intent(mContext, ScreenshotTakenReceiver.class));
-
// Optimizations
mScreenBitmap.setHasAlpha(false);
mScreenBitmap.prepareToDraw();
@@ -1080,20 +1077,4 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
context, intent.getStringExtra(EXTRA_ID), actionType, true);
}
}
-
- /**
- * Called when a screenshot has been taken and animation / screenshot UI is about to begin.
- */
- public static class ScreenshotTakenReceiver extends BroadcastReceiver {
- private final Lazy<BubbleController> mBubbleController;
-
- public ScreenshotTakenReceiver(Lazy<BubbleController> bubbleController) {
- mBubbleController = bubbleController;
- }
-
- @Override
- public void onReceive(Context context, Intent intent) {
- mBubbleController.get().hideImeFromExpandedBubble();
- }
- }
}