commit be8981442adbc43f1b6eb8fce3e243bd12714c68
author Andy Wickham <awickham@google.com> Tue Jul 25 18:47:14 2023 +0000
committer Andy Wickham <awickham@google.com> Wed Jul 26 20:56:05 2023 +0000
tree d1d3227affcc52aef94ac5f8bd575f91fa7b6481
parent 06ca4d9c6ed4d1a19f0ad30554d8c12f21d72403

Revert^2 "Change Overview Actions to round buttons."

f849f2856f3f70b36528a2198eab6cd96b40a3b4

Fix: 293081298

Change-Id: Iaf1553770329ec3a6c6d8a2d9d81b60203e79ed8

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 42372f1..28e0cf2 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -584,13 +584,11 @@
         overviewTaskIconDrawableSizeGridPx =
                 res.getDimensionPixelSize(R.dimen.task_thumbnail_icon_drawable_size_grid);
         overviewTaskThumbnailTopMarginPx = overviewTaskIconSizePx + overviewTaskMarginPx;
-        // Don't add margin with floating search bar to minimize risk of overlapping.
-        overviewActionsTopMarginPx = FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get() ? 0
-                : res.getDimensionPixelSize(R.dimen.overview_actions_top_margin);
+        overviewActionsTopMarginPx = res.getDimensionPixelSize(R.dimen.overview_actions_top_margin);
         overviewPageSpacing = res.getDimensionPixelSize(R.dimen.overview_page_spacing);
         overviewActionsButtonSpacing = res.getDimensionPixelSize(
                 R.dimen.overview_actions_button_spacing);
-        overviewActionsHeight = res.getDimensionPixelSize(R.dimen.overview_actions_height);
+        overviewActionsHeight = res.getDimensionPixelSize(R.dimen.overview_actions_size);
         overviewRowSpacing = res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing);
         overviewGridSideMargin = res.getDimensionPixelSize(R.dimen.overview_grid_side_margin);