Snap for 5974819 from 766c011ff0526f6a6d0c818caa5ac5237e71b8af to qt-qpr2-release (94eda9ac) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebChromeClient.java

+25 −9

Original line number	Original line	Diff line number	Diff line
	@@ -71,11 +71,24 @@ public class WebChromeClient {
	}		}

	/**		/**
	* Notify the host application that the current page has entered full		* Notify the host application that the current page has entered full screen mode. After this
	* screen mode. The host application must show the custom View which		* call, web content will no longer be rendered in the WebView, but will instead be rendered
	* contains the web contents — video or other HTML content —		* in {@code view}. The host application should add this View to a Window which is configured
	* in full screen mode. Also see "Full screen support" documentation on		* with {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN} flag in order to
	* {@link WebView}.		* actually display this web content full screen.
			*
			* <p>The application may explicitly exit fullscreen mode by invoking {@code callback} (ex. when
			* the user presses the back button). However, this is generally not necessary as the web page
			* will often show its own UI to close out of fullscreen. Regardless of how the WebView exits
			* fullscreen mode, WebView will invoke {@link #onHideCustomView()}, signaling for the
			* application to remove the custom View.
			*
			* <p>If this method is not overridden, WebView will report to the web page it does not support
			* fullscreen mode and will not honor the web page's request to run in fullscreen mode.
			*
			* <p class="note"><b>Note:</b> if overriding this method, the application must also override
			* {@link #onHideCustomView()}.
			*
	* @param view is the View object to be shown.		* @param view is the View object to be shown.
	* @param callback invoke this callback to request the page to exit		* @param callback invoke this callback to request the page to exit
	* full screen mode.		* full screen mode.
	@@ -98,10 +111,13 @@ public class WebChromeClient {
	CustomViewCallback callback) {};		CustomViewCallback callback) {};

	/**		/**
	* Notify the host application that the current page has exited full		* Notify the host application that the current page has exited full screen mode. The host
	* screen mode. The host application must hide the custom View, ie. the		* application must hide the custom View (the View which was previously passed to {@link
	* View passed to {@link #onShowCustomView} when the content entered fullscreen.		* #onShowCustomView(View, CustomViewCallback) onShowCustomView()}). After this call, web
	* Also see "Full screen support" documentation on {@link WebView}.		* content will render in the original WebView again.
			*
			* <p class="note"><b>Note:</b> if overriding this method, the application must also override
			* {@link #onShowCustomView(View, CustomViewCallback) onShowCustomView()}.
	*/		*/
	public void onHideCustomView() {}		public void onHideCustomView() {}

packages/SystemUI/res/layout/super_status_bar.xml

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@
	</com.android.systemui.statusbar.BackDropView>		</com.android.systemui.statusbar.BackDropView>

	<com.android.systemui.statusbar.ScrimView		<com.android.systemui.statusbar.ScrimView
	android:id="@+id/scrim_for_bubble"		android:id="@+id/scrim_behind"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="match_parent"		android:layout_height="match_parent"
	android:importantForAccessibility="no"		android:importantForAccessibility="no"
	@@ -56,14 +56,6 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content" />		android:layout_height="wrap_content" />

	<com.android.systemui.statusbar.ScrimView
	android:id="@+id/scrim_behind"
	android:layout_width="match_parent"
	android:layout_height="match_parent"
	android:importantForAccessibility="no"
	sysui:ignoreRightInset="true"
	/>

	<include layout="@layout/status_bar_expanded"		<include layout="@layout/status_bar_expanded"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="match_parent"		android:layout_height="match_parent"

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,12 +123,11 @@ public class SystemUIFactory {
	}		}

	public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,		public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,
	ScrimView scrimForBubble,
	LockscreenWallpaper lockscreenWallpaper,		LockscreenWallpaper lockscreenWallpaper,
	TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,		TriConsumer<ScrimState, Float, GradientColors> scrimStateListener,
	Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,		Consumer<Integer> scrimVisibleListener, DozeParameters dozeParameters,
	AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {		AlarmManager alarmManager, KeyguardMonitor keyguardMonitor) {
	return new ScrimController(scrimBehind, scrimInFront, scrimForBubble, scrimStateListener,		return new ScrimController(scrimBehind, scrimInFront, scrimStateListener,
	scrimVisibleListener, dozeParameters, alarmManager, keyguardMonitor);		scrimVisibleListener, dozeParameters, alarmManager, keyguardMonitor);
	}		}

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -316,9 +316,10 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
	if (mStackView == null) {		if (mStackView == null) {
	mStackView = new BubbleStackView(mContext, mBubbleData, mSurfaceSynchronizer);		mStackView = new BubbleStackView(mContext, mBubbleData, mSurfaceSynchronizer);
	ViewGroup sbv = mStatusBarWindowController.getStatusBarView();		ViewGroup sbv = mStatusBarWindowController.getStatusBarView();
	int bubbleScrimIndex = sbv.indexOfChild(sbv.findViewById(R.id.scrim_for_bubble));		// TODO(b/130237686): When you expand the shade on top of expanded bubble, there is no
	int stackIndex = bubbleScrimIndex + 1; // Show stack above bubble scrim.		// scrim between bubble and the shade
	sbv.addView(mStackView, stackIndex,		int bubblePosition = sbv.indexOfChild(sbv.findViewById(R.id.scrim_behind)) + 1;
			sbv.addView(mStackView, bubblePosition,
	new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));		new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
	if (mExpandListener != null) {		if (mExpandListener != null) {
	mStackView.setExpandListener(mExpandListener);		mStackView.setExpandListener(mExpandListener);

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -604,7 +604,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
	*/		*/
	public void onScrimVisibilityChanged(@ScrimVisibility int scrimsVisible) {		public void onScrimVisibilityChanged(@ScrimVisibility int scrimsVisible) {
	if (mWakeAndUnlockRunning		if (mWakeAndUnlockRunning
	&& scrimsVisible == ScrimController.TRANSPARENT) {		&& scrimsVisible == ScrimController.VISIBILITY_FULLY_TRANSPARENT) {
	mWakeAndUnlockRunning = false;		mWakeAndUnlockRunning = false;
	update();		update();
	}		}