Merge "Add back screenshot button to Launcher3" into sc-v2-dev am: 5656154f1a am: abda7bc69c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16365185

Change-Id: I61b276bc55eb8486828e5ee9c19251065564d56e
This commit is contained in:
Alex Chau
2021-12-06 18:06:27 +00:00
committed by Automerger Merge Worker
6 changed files with 39 additions and 14 deletions
@@ -187,6 +187,7 @@ public class DeviceProfile {
public final int overviewActionsMarginThreeButtonPx;
public final int overviewActionsTopMarginGesturePx;
public final int overviewActionsBottomMarginGesturePx;
public final int overviewActionsButtonSpacing;
public int overviewPageSpacing;
public int overviewRowSpacing;
public int overviewGridSideMargin;
@@ -378,10 +379,14 @@ public class DeviceProfile {
overviewActionsBottomMarginGesturePx = res.getDimensionPixelSize(
R.dimen.overview_actions_bottom_margin_gesture_grid_portrait);
}
overviewActionsButtonSpacing = res.getDimensionPixelSize(
R.dimen.overview_actions_button_spacing_grid);
} else {
overviewActionsTopMarginGesturePx = res.getDimensionPixelSize(
R.dimen.overview_actions_margin_gesture);
overviewActionsBottomMarginGesturePx = overviewActionsTopMarginGesturePx;
overviewActionsButtonSpacing = res.getDimensionPixelSize(
R.dimen.overview_actions_button_spacing);
}
overviewActionsMarginThreeButtonPx = res.getDimensionPixelSize(
R.dimen.overview_actions_margin_three_button);