Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Hide bubbles' IME after screenshot is taken."" into rvc-dev am: cf2c8428f4 am: 110d8c6b09 am: 75efbf8ce9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11829302

Change-Id: I2e1dbb1e6e734849d2fb7b08d08d98820356aeb1
This commit is contained in:
Matt Casey
2020-06-11 00:43:33 +00:00
committed by Automerger Merge Worker
parent e6e44624fc 75efbf8ce9
commit 292bae4dc6
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/AndroidManifest.xml
View File

@@ -406,10 +406,6 @@
<receiver android:name=".screenshot.GlobalScreenshot$SmartActionsReceiver" <receiver android:name=".screenshot.GlobalScreenshot$SmartActionsReceiver"
android:exported="false"/> 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 --> <!-- started from UsbDeviceSettingsManager -->
<activity android:name=".usb.UsbConfirmActivity" <activity android:name=".usb.UsbConfirmActivity"
android:exported="true" android:exported="true"

19
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -89,7 +89,6 @@ import android.widget.Toast;
import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLogger;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.bubbles.BubbleController;
import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBar;
@@ -492,8 +491,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
return; return;
} }
mContext.sendBroadcast(new Intent(mContext, ScreenshotTakenReceiver.class));
// Optimizations // Optimizations
mScreenBitmap.setHasAlpha(false); mScreenBitmap.setHasAlpha(false);
mScreenBitmap.prepareToDraw(); mScreenBitmap.prepareToDraw();
@@ -1178,20 +1175,4 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
context, intent.getStringExtra(EXTRA_ID), actionType, true); 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();
}
}
} }