Merge "Ensure the back gesture window is not touchable" into sc-dev (4c0f4e3a) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -512,6 +512,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
		lp.windowAnimations = 0;
		lp.setTitle("NavigationBar" + mContext.getDisplayId());
		lp.setFitInsetsTypes(0 /* types */);
		lp.setTrustedOverlay();

		NavigationBarFrame frame = (NavigationBarFrame) LayoutInflater.from(mContext).inflate(
		R.layout.navigation_bar_window, null);

+4 −4

Original line number	Diff line number	Diff line
		@@ -533,16 +533,16 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
		resources.getDimensionPixelSize(R.dimen.navigation_edge_panel_height),
		WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
		WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
		\| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
		\| WindowManager.LayoutParams.FLAG_SPLIT_TOUCH
		\| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
		\| WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
		PixelFormat.TRANSLUCENT);
		layoutParams.accessibilityTitle = mContext.getString(R.string.nav_bar_edge_panel);
		layoutParams.windowAnimations = 0;
		layoutParams.privateFlags \|=
		WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;
		layoutParams.setTitle(TAG + mContext.getDisplayId());
		layoutParams.accessibilityTitle = mContext.getString(R.string.nav_bar_edge_panel);
		layoutParams.windowAnimations = 0;
		layoutParams.setFitInsetsTypes(0 /* types */);
		layoutParams.setTrustedOverlay();
		return layoutParams;
		}