Merge cherrypicks of ['googleplex-android-review.googlesource.com/26621463',... (4d553c25) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8430,8 +8430,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* hierarchy		* hierarchy
	* @param refocus when propagate is true, specifies whether to request the		* @param refocus when propagate is true, specifies whether to request the
	* root view place new focus		* root view place new focus
			* @hide
	*/		*/
	void clearFocusInternal(View focused, boolean propagate, boolean refocus) {		public void clearFocusInternal(View focused, boolean propagate, boolean refocus) {
	if ((mPrivateFlags & PFLAG_FOCUSED) != 0) {		if ((mPrivateFlags & PFLAG_FOCUSED) != 0) {
	mPrivateFlags &= ~PFLAG_FOCUSED;		mPrivateFlags &= ~PFLAG_FOCUSED;
	clearParentsWantFocus();		clearParentsWantFocus();

core/java/android/widget/TextView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9733,7 +9733,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	return KEY_EVENT_HANDLED;		return KEY_EVENT_HANDLED;
	}		}
	if (hasFocus()) {		if (hasFocus()) {
	clearFocus();		clearFocusInternal(null, /* propagate / true, / refocus */ false);
	InputMethodManager imm = getInputMethodManager();		InputMethodManager imm = getInputMethodManager();
	if (imm != null) {		if (imm != null) {
	imm.hideSoftInputFromView(this, 0);		imm.hideSoftInputFromView(this, 0);

libs/hwui/renderthread/CanvasContext.cpp

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -994,7 +994,15 @@ void CanvasContext::destroyHardwareResources() {
	}		}

	void CanvasContext::onContextDestroyed() {		void CanvasContext::onContextDestroyed() {
	destroyHardwareResources();		// We don't want to destroyHardwareResources as that will invalidate display lists which
			// the client may not be expecting. Instead just purge all scratch resources
			if (mRenderPipeline->isContextReady()) {
			freePrefetchedLayers();
			for (const sp<RenderNode>& node : mRenderNodes) {
			node->destroyLayers();
			}
			mRenderPipeline->onDestroyHardwareResources();
			}
	}		}

	DeferredLayerUpdater* CanvasContext::createTextureLayer() {		DeferredLayerUpdater* CanvasContext::createTextureLayer() {

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1188,9 +1188,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
	}		}

	boolean isVolumeControlEnabled(@NonNull MediaDevice device) {		boolean isVolumeControlEnabled(@NonNull MediaDevice device) {
	return (isPlayBackInfoLocal()		return !device.isVolumeFixed();
	\|\| device.getDeviceType() != MediaDevice.MediaDeviceType.TYPE_CAST_GROUP_DEVICE)
	&& !device.isVolumeFixed();
	}		}

	@Override		@Override

packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ import static com.android.systemui.statusbar.phone.BarTransitions.MODE_TRANSPARE

	import android.content.ContentResolver;		import android.content.ContentResolver;
	import android.content.Context;		import android.content.Context;
			import android.content.res.Configuration;
	import android.database.ContentObserver;		import android.database.ContentObserver;
	import android.inputmethodservice.InputMethodService;		import android.inputmethodservice.InputMethodService;
	import android.net.Uri;		import android.net.Uri;
	@@ -73,6 +74,7 @@ import com.android.systemui.statusbar.CommandQueue;
	import com.android.systemui.statusbar.NotificationShadeWindowController;		import com.android.systemui.statusbar.NotificationShadeWindowController;
	import com.android.systemui.statusbar.phone.BarTransitions.TransitionMode;		import com.android.systemui.statusbar.phone.BarTransitions.TransitionMode;
	import com.android.systemui.statusbar.phone.CentralSurfaces;		import com.android.systemui.statusbar.phone.CentralSurfaces;
			import com.android.systemui.statusbar.policy.ConfigurationController;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;

	import dagger.Lazy;		import dagger.Lazy;
	@@ -100,7 +102,7 @@ public final class NavBarHelper implements
	AccessibilityButtonModeObserver.ModeChangedListener,		AccessibilityButtonModeObserver.ModeChangedListener,
	AccessibilityButtonTargetsObserver.TargetsChangedListener,		AccessibilityButtonTargetsObserver.TargetsChangedListener,
	OverviewProxyService.OverviewProxyListener, NavigationModeController.ModeChangedListener,		OverviewProxyService.OverviewProxyListener, NavigationModeController.ModeChangedListener,
	Dumpable, CommandQueue.Callbacks {		Dumpable, CommandQueue.Callbacks, ConfigurationController.ConfigurationListener {
	private static final String TAG = NavBarHelper.class.getSimpleName();		private static final String TAG = NavBarHelper.class.getSimpleName();

	private final Handler mHandler = new Handler(Looper.getMainLooper());		private final Handler mHandler = new Handler(Looper.getMainLooper());
	@@ -188,6 +190,7 @@ public final class NavBarHelper implements
	UserTracker userTracker,		UserTracker userTracker,
	DisplayTracker displayTracker,		DisplayTracker displayTracker,
	NotificationShadeWindowController notificationShadeWindowController,		NotificationShadeWindowController notificationShadeWindowController,
			ConfigurationController configurationController,
	DumpManager dumpManager,		DumpManager dumpManager,
	CommandQueue commandQueue,		CommandQueue commandQueue,
	@Main Executor mainExecutor) {		@Main Executor mainExecutor) {
	@@ -214,6 +217,7 @@ public final class NavBarHelper implements

	mNavBarMode = navigationModeController.addListener(this);		mNavBarMode = navigationModeController.addListener(this);
	mCommandQueue.addCallback(this);		mCommandQueue.addCallback(this);
			configurationController.addCallback(this);
	overviewProxyService.addCallback(this);		overviewProxyService.addCallback(this);
	dumpManager.registerDumpable(this);		dumpManager.registerDumpable(this);
	}		}
	@@ -358,6 +362,11 @@ public final class NavBarHelper implements
	updateA11yState();		updateA11yState();
	}		}

			@Override
			public void onConfigChanged(Configuration newConfig) {
			mEdgeBackGestureHandler.onConfigurationChanged(newConfig);
			}

	/**		/**
	* Updates the current accessibility button state. The accessibility button state is only		* Updates the current accessibility button state. The accessibility button state is only
	* used for {@link Secure#ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR} and		* used for {@link Secure#ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR} and