Merge "Remove unused HomeRotatedPageHandler" into ub-launcher3-rvc-dev (bb58efab) · Commits · e / os / BlissLauncher3

quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
		case TestProtocol.REQUEST_BACKGROUND_TO_OVERVIEW_SWIPE_HEIGHT: {
		final float swipeHeight =
		LayoutUtils.getShelfTrackingDistance(mContext, mDeviceProfile,
		PagedOrientationHandler.HOME_ROTATED);
		PagedOrientationHandler.PORTRAIT);
		response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, (int) swipeHeight);
		return response;
		}

quickstep/src/com/android/quickstep/util/RecentsOrientedState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ public final class RecentsOrientedState implements SharedPreferences.OnSharedPre
		mPreviousRotation = touchRotation;

		if (mLauncherRotation == mTouchRotation \|\| canLauncherRotate()) {
		mOrientationHandler = PagedOrientationHandler.HOME_ROTATED;
		mOrientationHandler = PagedOrientationHandler.PORTRAIT;
		if (DEBUG) {
		Log.d(TAG, "current RecentsOrientedState: " + this);
		}

src/com/android/launcher3/touch/HomeRotatedPageHandler.java

deleted100644 → 0

+0 −55

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.launcher3.touch;

		import android.graphics.RectF;
		import android.view.Surface;
		import android.widget.LinearLayout;

		public class HomeRotatedPageHandler extends PortraitPagedViewHandler {
		@Override
		public void offsetTaskRect(RectF rect, float value, int displayRotation, int launcherRotation) {
		if (launcherRotation == Surface.ROTATION_0) {
		super.offsetTaskRect(rect, value, displayRotation, launcherRotation);
		} else if (launcherRotation == Surface.ROTATION_90) {
		if (displayRotation == Surface.ROTATION_0) {
		rect.offset(0, value);
		} else if (displayRotation == Surface.ROTATION_90) {
		rect.offset(value, 0);
		} else if (displayRotation == Surface.ROTATION_180) {
		rect.offset(-value, 0);
		} else {
		rect.offset(-value, 0);
		}
		} else if (launcherRotation == Surface.ROTATION_270) {
		if (displayRotation == Surface.ROTATION_0) {
		rect.offset(0, -value);
		} else if (displayRotation == Surface.ROTATION_90) {
		rect.offset(value, 0);
		} else if (displayRotation == Surface.ROTATION_180) {
		rect.offset(0, -value);
		} else {
		rect.offset(value, 0);
		}
		} // TODO (b/149609488) handle 180 case as well
		}

		@Override
		public int getTaskMenuLayoutOrientation(LinearLayout taskMenuLayout) {
		return taskMenuLayout.getOrientation();
		}
		}

src/com/android/launcher3/touch/LandscapePagedViewHandler.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -180,19 +180,6 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
		return Surface.ROTATION_90;
		}

		@Override
		public void offsetTaskRect(RectF rect, float value, int displayRotation, int launcherRotation) {
		if (displayRotation == Surface.ROTATION_0) {
		rect.offset(0, value);
		} else if (displayRotation == Surface.ROTATION_90) {
		rect.offset(value, 0);
		} else if (displayRotation == Surface.ROTATION_180) {
		rect.offset(0, -value);
		} else {
		rect.offset(-value, 0);
		}
		}

		@Override
		public int getChildStart(View view) {
		return view.getTop();

src/com/android/launcher3/touch/PagedOrientationHandler.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ public interface PagedOrientationHandler {
		PagedOrientationHandler PORTRAIT = new PortraitPagedViewHandler();
		PagedOrientationHandler LANDSCAPE = new LandscapePagedViewHandler();
		PagedOrientationHandler SEASCAPE = new SeascapePagedViewHandler();
		PagedOrientationHandler HOME_ROTATED = new HomeRotatedPageHandler();

		interface Int2DAction<T> {
		void call(T target, int x, int y);
		@@ -82,7 +81,6 @@ public interface PagedOrientationHandler {
		boolean getRecentsRtlSetting(Resources resources);
		float getDegreesRotated();
		int getRotation();
		void offsetTaskRect(RectF rect, float value, int delta, int launcherRotation);
		int getPrimaryValue(int x, int y);
		int getSecondaryValue(int x, int y);
		void delegateScrollTo(PagedView pagedView, int secondaryScroll, int primaryScroll);