Merge cherrypicks of [11844326] into rvc-release (26968351) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -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"

+0 −19

Original line number	Diff line number	Diff line
		@@ -89,7 +89,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;
		@@ -492,8 +491,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
		return;
		}

		mContext.sendBroadcast(new Intent(mContext, ScreenshotTakenReceiver.class));

		// Optimizations
		mScreenBitmap.setHasAlpha(false);
		mScreenBitmap.prepareToDraw();
		@@ -1178,20 +1175,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();
		}
		}
		}