Merge branch 'ub-launcher3-dorval-polish2' into 1003 am: a328a0d83a (4c2a16c2) · Commits · e / os / android_packages_apps_Trebuchet

go/res/values/dimens.xml

0 → 100644

+20 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2017 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.
			-->

			<resources>
			<!-- Dynamic Grid -->
			<dimen name="dynamic_grid_hotseat_size">60dp</dimen>
			</resources>
			No newline at end of file

go/res/xml/device_profiles.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@
	launcher:numColumns="4"		launcher:numColumns="4"
	launcher:numFolderRows="4"		launcher:numFolderRows="4"
	launcher:numFolderColumns="4"		launcher:numFolderColumns="4"
	launcher:iconSize="56"		launcher:iconSize="60"
	launcher:iconTextSize="14.0"		launcher:iconTextSize="14.0"
	launcher:defaultLayoutId="@xml/default_workspace_4x4"		launcher:defaultLayoutId="@xml/default_workspace_4x4"
	/>		/>

src/com/android/launcher3/DeviceProfile.java

+15 −3

Original line number	Original line	Diff line number	Diff line
	@@ -350,9 +350,18 @@ public class DeviceProfile {
	iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale);		iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale);
	iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);		iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);

	cellWidthPx = iconSizePx + iconDrawablePaddingPx;
	cellHeightPx = iconSizePx + iconDrawablePaddingPx		cellHeightPx = iconSizePx + iconDrawablePaddingPx
	+ Utilities.calculateTextHeight(iconTextSizePx);		+ Utilities.calculateTextHeight(iconTextSizePx);
			int cellYPadding = (getCellSize().y - cellHeightPx) / 2;
			if (iconDrawablePaddingPx > cellYPadding && !isVerticalBarLayout()
			&& !inMultiWindowMode()) {
			// Ensures that the label is closer to its corresponding icon. This is not an issue
			// with vertical bar layout or multi-window mode since the issue is handled separately
			// with their calls to {@link #adjustToHideWorkspaceLabels}.
			cellHeightPx -= (iconDrawablePaddingPx - cellYPadding);
			iconDrawablePaddingPx = cellYPadding;
			}
			cellWidthPx = iconSizePx + iconDrawablePaddingPx;

	// All apps		// All apps
	allAppsIconTextSizePx = iconTextSizePx;		allAppsIconTextSizePx = iconTextSizePx;
	@@ -755,11 +764,14 @@ public class DeviceProfile {
	return new int[] { padding.left - mInsets.left, padding.right + mInsets.left};		return new int[] { padding.left - mInsets.left, padding.right + mInsets.left};
	}		}

			public boolean inMultiWindowMode() {
			return this != inv.landscapeProfile && this != inv.portraitProfile;
			}

	public boolean shouldIgnoreLongPressToOverview(float touchX) {		public boolean shouldIgnoreLongPressToOverview(float touchX) {
	boolean inMultiWindowMode = this != inv.landscapeProfile && this != inv.portraitProfile;
	boolean touchedLhsEdge = mInsets.left == 0 && touchX < edgeMarginPx;		boolean touchedLhsEdge = mInsets.left == 0 && touchX < edgeMarginPx;
	boolean touchedRhsEdge = mInsets.right == 0 && touchX > (widthPx - edgeMarginPx);		boolean touchedRhsEdge = mInsets.right == 0 && touchX > (widthPx - edgeMarginPx);
	return !inMultiWindowMode && (touchedLhsEdge \|\| touchedRhsEdge);		return !inMultiWindowMode() && (touchedLhsEdge \|\| touchedRhsEdge);
	}		}

	private static Context getContext(Context c, int orientation) {		private static Context getContext(Context c, int orientation) {

src/com/android/launcher3/Launcher.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -91,6 +91,7 @@ import com.android.launcher3.anim.AnimationLayerSet;
	import com.android.launcher3.compat.AppWidgetManagerCompat;		import com.android.launcher3.compat.AppWidgetManagerCompat;
	import com.android.launcher3.compat.LauncherAppsCompat;		import com.android.launcher3.compat.LauncherAppsCompat;
	import com.android.launcher3.compat.LauncherAppsCompatVO;		import com.android.launcher3.compat.LauncherAppsCompatVO;
			import com.android.launcher3.compat.UserManagerCompat;
	import com.android.launcher3.config.FeatureFlags;		import com.android.launcher3.config.FeatureFlags;
	import com.android.launcher3.dragndrop.DragController;		import com.android.launcher3.dragndrop.DragController;
	import com.android.launcher3.dragndrop.DragLayer;		import com.android.launcher3.dragndrop.DragLayer;
	@@ -137,6 +138,7 @@ import com.android.launcher3.widget.WidgetAddFlowHandler;
	import com.android.launcher3.widget.WidgetHostViewLoader;		import com.android.launcher3.widget.WidgetHostViewLoader;
	import com.android.launcher3.widget.WidgetsContainerView;		import com.android.launcher3.widget.WidgetsContainerView;


	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.util.ArrayList;		import java.util.ArrayList;
	@@ -3893,7 +3895,8 @@ public class Launcher extends BaseActivity
	}		}

	private boolean shouldShowDiscoveryBounce() {		private boolean shouldShowDiscoveryBounce() {
	return mState == State.WORKSPACE && !mSharedPrefs.getBoolean(APPS_VIEW_SHOWN, false);		UserManagerCompat um = UserManagerCompat.getInstance(this);
			return mState == State.WORKSPACE && !mSharedPrefs.getBoolean(APPS_VIEW_SHOWN, false) && !um.isDemoUser();
	}		}

	protected void moveWorkspaceToDefaultScreen() {		protected void moveWorkspaceToDefaultScreen() {