Merge "Enabling background protection for back arrow on secondary displays" (d403f539) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.navigationbar.gestural;

		import static android.view.Display.DEFAULT_DISPLAY;

		import android.animation.ValueAnimator;
		import android.content.Context;
		import android.content.res.Configuration;
		@@ -334,6 +336,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
		.getDimension(R.dimen.navigation_edge_action_drag_threshold);
		setVisibility(GONE);

		boolean isPrimaryDisplay = mContext.getDisplayId() == DEFAULT_DISPLAY;
		mRegionSamplingHelper = new RegionSamplingHelper(this,
		new RegionSamplingHelper.SamplingCallback() {
		@Override
		@@ -345,8 +348,14 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
		public Rect getSampledRegion(View sampledView) {
		return mSamplingRect;
		}

		@Override
		public boolean isSamplingEnabled() {
		return isPrimaryDisplay;
		}
		});
		mRegionSamplingHelper.setWindowVisible(true);
		mShowProtection = !isPrimaryDisplay;
		}

		@Override
		@@ -366,11 +375,6 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
		updateIsDark(animate);
		}

		private void setShowProtection(boolean showProtection) {
		mShowProtection = showProtection;
		invalidate();
		}

		@Override
		public void setIsLeftPanel(boolean isLeftPanel) {
		mIsLeftPanel = isLeftPanel;