Merge "Removing some redundant resource definitions" into ub-launcher3-master (916a4a51) · Commits · e / os / android_packages_apps_Trebuchet

res/values-land/dimens.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -27,9 +27,6 @@
		<!-- Dynamic grid -->
		<dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>

		<dimen name="dynamic_grid_cell_layout_padding">0dp</dimen>
		<dimen name="dynamic_grid_cell_layout_bottom_padding">5.5dp</dimen>

		<!-- Hotseat -->
		<dimen name="dynamic_grid_hotseat_side_padding">16dp</dimen>
		</resources>

res/values/dimens.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -22,13 +22,10 @@
		<dimen name="dynamic_grid_edge_margin">8dp</dimen>
		<dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen>
		<dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen>
		<dimen name="dynamic_grid_workspace_top_padding">8dp</dimen>
		<dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>
		<!-- Minimum space between workspace and hotseat in spring loaded mode -->
		<dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>

		<dimen name="dynamic_grid_cell_layout_padding">5.5dp</dimen>
		<dimen name="dynamic_grid_cell_layout_bottom_padding">0dp</dimen>
		<dimen name="dynamic_grid_cell_padding_x">8dp</dimen>

		<!-- Hotseat -->

src/com/android/launcher3/DeviceProfile.java

+15 −21

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

		package com.android.launcher3;

		import android.appwidget.AppWidgetHostView;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		@@ -70,9 +68,6 @@ public class DeviceProfile {
		public final int cellLayoutPaddingLeftRightPx;
		public final int cellLayoutBottomPaddingPx;
		public final int edgeMarginPx;
		public final Rect defaultWidgetPadding;
		public final int defaultPageSpacingPx;
		private final int topWorkspacePadding;
		public float workspaceSpringLoadShrinkFactor;
		public final int workspaceSpringLoadedBottomSpace;

		@@ -177,26 +172,25 @@ public class DeviceProfile {
		: Configuration.ORIENTATION_PORTRAIT);
		res = context.getResources();


		ComponentName cn = new ComponentName(context.getPackageName(),
		this.getClass().getName());
		defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null);
		edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
		desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx;

		int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet
		? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1;
		cellLayoutPaddingLeftRightPx = cellLayoutPaddingLeftRightMultiplier *
		res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
		cellLayoutBottomPaddingPx =
		res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_bottom_padding);
		int cellLayoutPadding = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
		if (isLandscape) {
		cellLayoutPaddingLeftRightPx = 0;
		cellLayoutBottomPaddingPx = cellLayoutPadding;
		} else {
		cellLayoutPaddingLeftRightPx = cellLayoutPaddingLeftRightMultiplier * cellLayoutPadding;
		cellLayoutBottomPaddingPx = 0;
		}

		verticalDragHandleSizePx = res.getDimensionPixelSize(
		R.dimen.vertical_drag_handle_size);
		verticalDragHandleOverlapWorkspace =
		res.getDimensionPixelSize(R.dimen.vertical_drag_handle_overlap_workspace);
		defaultPageSpacingPx =
		res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_page_spacing);
		topWorkspacePadding =
		res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_top_padding);

		iconDrawablePaddingOriginalPx =
		res.getDimensionPixelSize(R.dimen.dynamic_grid_icon_drawable_padding);
		dropTargetBarSizePx = res.getDimensionPixelSize(R.dimen.dynamic_grid_drop_target_size);
		@@ -360,7 +354,7 @@ public class DeviceProfile {

		if (!isVerticalLayout) {
		int expectedWorkspaceHeight = availableHeightPx - hotseatBarSizePx
		- verticalDragHandleSizePx - topWorkspacePadding;
		- verticalDragHandleSizePx - edgeMarginPx;
		float minRequiredHeight = dropTargetBarSizePx + workspaceSpringLoadedBottomSpace;
		workspaceSpringLoadShrinkFactor = Math.min(
		res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f,
		@@ -471,15 +465,15 @@ public class DeviceProfile {
		((inv.numColumns - 1) * cellWidthPx)));
		availablePaddingX = (int) Math.min(availablePaddingX,
		widthPx * MAX_HORIZONTAL_PADDING_PERCENT);
		int availablePaddingY = Math.max(0, heightPx - topWorkspacePadding - paddingBottom
		int availablePaddingY = Math.max(0, heightPx - edgeMarginPx - paddingBottom
		- (2 * inv.numRows * cellHeightPx) - hotseatBarTopPaddingPx
		- hotseatBarBottomPaddingPx);
		padding.set(availablePaddingX / 2, topWorkspacePadding + availablePaddingY / 2,
		padding.set(availablePaddingX / 2, edgeMarginPx + availablePaddingY / 2,
		availablePaddingX / 2, paddingBottom + availablePaddingY / 2);
		} else {
		// Pad the top and bottom of the workspace with search/hotseat bar sizes
		padding.set(desiredWorkspaceLeftRightMarginPx,
		topWorkspacePadding,
		edgeMarginPx,
		desiredWorkspaceLeftRightMarginPx,
		paddingBottom);
		}

src/com/android/launcher3/DropTargetBar.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ public class DropTargetBar extends FrameLayout
		/ (2 * (grid.inv.numColumns + 1)))
		+ grid.edgeMarginPx;
		} else {
		gap = grid.desiredWorkspaceLeftRightMarginPx - grid.defaultWidgetPadding.right;
		gap = grid.desiredWorkspaceLeftRightMarginPx - grid.inv.defaultWidgetPadding.right;
		}
		lp.width = grid.availableWidthPx - 2 * gap;

src/com/android/launcher3/InvariantDeviceProfile.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,7 +20,9 @@ import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;
		import static com.android.launcher3.Utilities.getDevicePrefs;

		import android.annotation.TargetApi;
		import android.appwidget.AppWidgetHostView;
		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		@@ -29,6 +31,7 @@ import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.content.res.XmlResourceParser;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.util.DisplayMetrics;
		@@ -114,6 +117,7 @@ public class InvariantDeviceProfile {
		public DeviceProfile portraitProfile;

		public Point defaultWallpaperSize;
		public Rect defaultWidgetPadding;

		private final ArrayList<OnIDPChangeListener> mChangeListeners = new ArrayList<>();
		private ConfigMonitor mConfigMonitor;
		@@ -235,6 +239,10 @@ public class InvariantDeviceProfile {
		} else {
		defaultWallpaperSize = new Point(Math.max(smallSide * 2, largeSide), largeSide);
		}

		ComponentName cn = new ComponentName(context.getPackageName(), getClass().getName());
		defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null);

		return closestProfile.name;
		}