Merge "Always show back button when screen pinning, for prototype" (2f9883f9) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -276,8 +276,10 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav

		@Override
		public void onBackButtonVisibilityChanged(boolean visible) {
		if (!inScreenPinning()) {
		getBackButton().setVisibility(visible ? VISIBLE : GONE);
		}
		}

		@Override
		public void onColorAdaptChanged(boolean enabled) {
		@@ -940,6 +942,9 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
		public void showPinningEnterExitToast(boolean entering) {
		if (entering) {
		mScreenPinningNotify.showPinningStartToast();

		// TODO(b/112934365): remove after prototype finished, only needed to escape from pin
		getBackButton().setVisibility(VISIBLE);
		} else {
		mScreenPinningNotify.showPinningExitToast();
		}