Merge "Merge "Initial changes for full-width quickscrub." into pi-dev am:... (ac4381d3) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -938,7 +938,7 @@
		<dimen name="rounded_corner_radius_bottom">0dp</dimen>
		<dimen name="rounded_corner_content_padding">0dp</dimen>
		<dimen name="nav_content_padding">0dp</dimen>
		<dimen name="nav_quick_scrub_track_edge_padding">42dp</dimen>
		<dimen name="nav_quick_scrub_track_edge_padding">24dp</dimen>
		<dimen name="nav_quick_scrub_track_thickness">2dp</dimen>

		<!-- Navigation bar shadow params. -->

packages/SystemUI/shared/src/com/android/systemui/shared/system/NavigationBarCompat.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -37,16 +37,12 @@ public class NavigationBarCompat {
		return convertDpToPixel(10);
		}

		public static int getQuickScrubDragSlopPx() {
		return convertDpToPixel(20);
		}

		public static int getQuickStepTouchSlopPx() {
		return convertDpToPixel(24);
		}

		public static int getQuickScrubTouchSlopPx() {
		return convertDpToPixel(35);
		return convertDpToPixel(24);
		}

		@Retention(RetentionPolicy.SOURCE)

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

+21 −6

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
		private Rect mRecentsButtonBounds = new Rect();
		private Rect mRotationButtonBounds = new Rect();
		private int[] mTmpPosition = new int[2];
		private Rect mTmpRect = new Rect();

		private KeyButtonDrawable mBackIcon;
		private KeyButtonDrawable mBackCarModeIcon, mBackLandCarModeIcon;
		@@ -876,14 +877,27 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav

		public boolean isRotateButtonVisible() { return mShowRotateButton; }

		public void setMenuContainerVisibility(boolean visible) {
		getMenuContainer().setAlpha(visible ? 1 : 0, true /* animate */);
		/**
		* @return the button at the given {@param x} and {@param y}.
		*/
		ButtonDispatcher getButtonAtPosition(int x, int y) {
		for (int i = 0; i < mButtonDispatchers.size(); i++) {
		ButtonDispatcher button = mButtonDispatchers.valueAt(i);
		View buttonView = button.getCurrentView();
		if (buttonView != null) {
		buttonView.getHitRect(mTmpRect);
		offsetDescendantRectToMyCoords(buttonView, mTmpRect);
		if (mTmpRect.contains(x, y)) {
		return button;
		}
		}
		}
		return null;
		}

		@Override
		public void onFinishInflate() {
		mNavigationInflaterView = (NavigationBarInflaterView) findViewById(
		R.id.navigation_inflater);
		mNavigationInflaterView = findViewById(R.id.navigation_inflater);
		mNavigationInflaterView.setButtonDispatchers(mButtonDispatchers);

		getImeSwitchButton().setOnClickListener(mImeSwitcherClickListener);
		@@ -1176,10 +1190,11 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
		+ " " + visibilityToString(getWindowVisibility())
		+ (offscreen ? " OFFSCREEN!" : ""));

		pw.println(String.format(" mCurrentView: id=%s (%dx%d) %s",
		pw.println(String.format(" mCurrentView: id=%s (%dx%d) %s %f",
		getResourceName(getCurrentView().getId()),
		getCurrentView().getWidth(), getCurrentView().getHeight(),
		visibilityToString(getCurrentView().getVisibility())));
		visibilityToString(getCurrentView().getVisibility()),
		getCurrentView().getAlpha()));

		pw.println(String.format(" disabled=0x%08x vertical=%s menu=%s",
		mDisabledFlags,

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

+135 −130

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+4 −6

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

		package com.android.systemui.statusbar.policy;

		import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
		import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;

		import android.app.ActivityManager;
		import android.content.Context;
		import android.content.res.Configuration;
		@@ -41,20 +44,14 @@ import android.view.ViewConfiguration;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.widget.ImageView;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.systemui.Dependency;
		import com.android.systemui.OverviewProxyService;
		import com.android.systemui.R;
		import com.android.systemui.plugins.statusbar.phone.NavBarButtonProvider.ButtonInterface;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.NavigationBarCompat;

		import static android.view.KeyEvent.KEYCODE_HOME;
		import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
		import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK;

		public class KeyButtonView extends ImageView implements ButtonInterface {
		private static final String TAG = KeyButtonView.class.getSimpleName();

		@@ -119,6 +116,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
		mRipple = new KeyButtonRipple(context, this);
		mOverviewProxyService = Dependency.get(OverviewProxyService.class);
		setBackground(mRipple);
		forceHasOverlappingRendering(false);
		}

		@Override