Commit Graph

467 Commits

Author SHA1 Message Date
Vinit Nayak
c7293179d0 Space out 3 button nav on taskbar
* Add additional margin on nav buttons if
there's overlap w/ contextual button
* End spacing is dependent on grid layout

Bug: 223724516
Test: Tested on unfolded with different
grid sizes.

Change-Id: Ie814f35cd1f35629744050ee3f7242c5a8599883
2022-07-25 13:15:11 -07:00
Alex Chau
62572c04e2 Revert "Move BaseActivityInterface task size methods to DevicePr..."
Revert "Move BaseActivityInterface task size methods to DevicePr..."

Revert submission 19279487-baseactivityinterface

Reason for revert: As per discussion in ag/19341332, make sure DeviceProfile can properly react to inset changes before moving task size calculations there
Reverted Changes:
I30324d34c:Move BaseActivityInterface task size methods to De...
Ia9c1d0387:Move BaseActivityInterface task size methods to De...

Bug: 238593212
Change-Id: I0d40fdd4a5d4468494e30cef32a284479ddd2feb
2022-07-25 18:38:03 +00:00
Pat Manning
4e73e5e352 Move BaseActivityInterface task size methods to DeviceProfile.
Fix: 238593212
Test: DeviceProfilePhoneTest.kt
Test: DeviceProfileVerticalBarTest.kt
Test: DeviceProfilePhone3ButtonTest.kt
Test: DeviceProfileVerticalBar3ButtonTest.kt
Test: DeviceProfileTabletLandscapeTest.kt
Test: DeviceProfileTabletPortraitTest.kt
Test: DeviceProfileTabletLandscape3ButtonTest.kt
Test: DeviceProfileTabletPortrait3ButtonTest.kt
Test: DeviceProfileTwoPanelLandscapeTest.kt
Test: DeviceProfileTwoPanelPortraitTest.kt
Test: DeviceProfileTwoPanelLandscape3ButtonTest.kt
Test: DeviceProfileTwoPanelPortrait3ButtonTest.kt
Change-Id: I30324d34ca119a467f530b590949743c2ba7b91a
2022-07-18 16:35:02 +01:00
Pat Manning
26f70f777e Add DeviceProfile tests on all attributes across different configurations.
Fix: 237542518
Test: DeviceProfilePhoneTest.kt
Test: DeviceProfileVerticalBarTest.kt
Test: DeviceProfilePhone3ButtonTest.kt
Test: DeviceProfileVerticalBar3ButtonTest.kt
Test: DeviceProfileTabletLandscapeTest.kt
Test: DeviceProfileTabletPortraitTest.kt
Test: DeviceProfileTabletLandscape3ButtonTest.kt
Test: DeviceProfileTabletPortrait3ButtonTest.kt
Test: DeviceProfileTwoPanelLandscapeTest.kt
Test: DeviceProfileTwoPanelPortraitTest.kt
Test: DeviceProfileTwoPanelLandscape3ButtonTest.kt
Test: DeviceProfileTwoPanelPortrait3ButtonTest.kt
Change-Id: I1596dcd1fb8c9b353cdfcab224d7670d88bed716
2022-07-12 14:17:18 +01:00
Alex Chau
0c4e11b479 Make workspace and hotseat scale down in widgets picker
- Also centralized workspace content scale percentage to DeviceProfile

Test: manual
Fix: 231699666
Change-Id: I3f8dcb9921e0cd93ad391d51120b189005ad07df
2022-07-08 19:03:48 +01:00
Thales Lima
b8c0595d42 Add new hotseat bottom margin options
This changes how the hotseat height is calculated and by consequence how spaces are distributed in the workspace as well. This is the first of a series of changes that will improve and streamline workspace calculations.

Bug: 228998463
Fix: 234023782
Fix: 230191631
Fix: 232914299
Fix: 236238226
Test: manual, HSV and comparing to mocks
Change-Id: If021e8ba2c7c24c0bf9f27a1aa7aa946792ed04f
2022-07-05 15:33:47 +01:00
Pat Manning
a7335bccdc Simplify vertical bar hotseat bottom calculation for spring loaded state.
Fix: 236941743
Test: manual.
Change-Id: I7f110fea48eb88e7f941a64c17a65feec14531f3
2022-07-04 12:45:40 +01:00
Thales Lima
616e0102a4 Fix QSB alignment
Fix: 232908328
Test: manual
Change-Id: If5516be6b8f7142577257f5ec5b5dfa8feca445d
2022-06-15 11:40:58 +01:00
Brandon Dayauon
7a8a9ed170 Fix issue where allAppsCellWidth is 0
when using secondary display on non-scalable grids causing allApps to be squished.
Bug: 234748862
Test: Manual

Change-Id: I2e92bce69438a17eccb0e4b2b2e3f2bdbfa7600e
2022-06-06 14:32:22 -07:00
Jeremy Sim
0183476559 Merge "Remove deprecated verticalBar layout in Overview" into tm-qpr-dev 2022-06-01 02:55:47 +00:00
Jeremy Sim
3c2c3f1aea Remove deprecated verticalBar layout in Overview
Removes code that was intended for a now-deprecated layout style in Overview. See ag/18386646 for an example of an issue caused by this.

Bug: 232298587
Test: Manual on 3 devices
Change-Id: Icfd40e1e5a99cf5821b1c46357db58a31daaa835
2022-05-31 22:02:57 +00:00
Brandon Dayauon
039036693a Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I9d35410f26d6e7ea42872e3029f51883aa65093e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:12:55 +00:00
Brandon Dayauon
5ba5c76c76 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev 2022-05-26 16:06:02 +00:00
Alex Chau
56e367b744 Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev 2022-05-26 09:24:23 +00:00
Brian Isganitis
0bc68242ee Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-qpr-dev 2022-05-25 20:27:21 +00:00
Brian Isganitis
a9a78117c7 Have separate DeviceProfile instances for taskbar and all apps windows.
We want to scale down the DeviceProfile for taskbar, but the all apps
window should rely on the original DeviceProfile.

Test: Manual
Fix: 232907361
Change-Id: Ia09f674ada9e445c1d7278fa94c536ea9de13ef9
Merged-In: Ia09f674ada9e445c1d7278fa94c536ea9de13ef9
2022-05-25 18:11:51 +00:00
Alex Chau
6329b20f43 Merge "Center drop target button alignment across devices" into tm-dev am: 179c289a6c am: 7ca1b38d7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18580267

Change-Id: I57dd855387257a8704f8529f14ea176562e63549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 13:24:02 +00:00
Alex Chau
e2e1509d55 Fix taskbar icon flicker and jump when transforming to hotseat
- Apply additional translation on TaskbarView to account for difference between taskbar icon to bottom spacing compared to hotseat icon to bottom spacing
- Call updateIconAlignment outside of synchronizeNextDraw's then block, which get run after the synchronization

Bug: 204850744
Test: manual
Change-Id: Id65842f506eb342105082649446eb694cd5c33a4
(cherry picked from commit 51da219869)
Merged-In: Id65842f506eb342105082649446eb694cd5c33a4
2022-05-25 10:53:29 +00:00
Alex Chau
5b0193026a Center drop target button alignment across devices
- Partial re-land of http://ag/18520765

Fix: 229789612
Fix: 231711806
Test: manual
Change-Id: I0630c19901435a30379596378e9c0cd4beb2e764
2022-05-24 18:31:57 +01:00
Alex Chau
1db078ee31 Merge "Update drop target button alignment across devices" into tm-dev am: 618047355d am: 15ca7e759b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18557384

Change-Id: I1c7bb488bd2a164a6d3caf9a3f719b9e96e487cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:35:23 +00:00
TreeHugger Robot
fe4a4d1cb9 Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-qpr-dev 2022-05-23 19:21:14 +00:00
Alex Chau
906d882f91 Update drop target button alignment across devices
- Partial re-land of http://ag/18520765
- Layout the buttons from center of screen for two panels, or from center of workspace for all other cases

Bug: 229789612
Fix: 231706480
Fix: 232063941
Fix: 232283628
Test: manual
Change-Id: Icbc9e2a19140ce3127d5dfe9f798a8ada336cea8
2022-05-23 15:08:52 +00:00
Alex Chau
51da219869 Fix taskbar icon flicker and jump when transforming to hotseat
- Apply additional translation on TaskbarView to account for difference between taskbar icon to bottom spacing compared to hotseat icon to bottom spacing
- Call updateIconAlignment outside of synchronizeNextDraw's then block, which get run after the synchronization

Bug: 204850744
Test: manual
Change-Id: Id65842f506eb342105082649446eb694cd5c33a4
2022-05-23 14:33:34 +01:00
Pat Manning
b29dabce18 Revert "Update drop target button alignment across devices."
This reverts commit 27bfcaa651.

Reason for revert: b/232636570

Bug: 229789612
Bug: 231711806
Bug: 231706480
Bug: 232063941
Bug: 232283628
Change-Id: Ic83515173f4a64228a80f63d75db938243cbf625
2022-05-20 18:20:26 +00:00
Brandon Dayauon
969f6a8c4d fixed scalable grid allApps to match home screen icons in largest display size
fixed allApps Icon's text size to scale

Test: Pictures in bug thread
Bug: 232908037
Change-Id: I4b171e76c61d1fe913c23034b823f16668839f1b
2022-05-20 09:49:56 -07:00
Brandon Dayauon
07ca884eea App row padding is now consistent for all grid sizes. Also fix when 2x2 allApp icons get super big.
Added consistent padding to each app row.

Bug: 229789736
Bug: 229791507
Bug: 228320417
Bug: 230870213
Test: Manual on Raven

Change-Id: Ice1c8be361f009994a8e0960a30da04fc1c0c218
2022-05-13 17:10:15 -07:00
Pat Manning
8909fc2dcb Merge "Update drop target button alignment across devices." into tm-dev 2022-05-12 18:41:54 +00:00
Pat Manning
a54d1ab24a Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."" into tm-dev 2022-05-12 16:00:51 +00:00
Alex Chau
f4c8da6263 Merge "Tune overview icon size and paddings" into tm-dev 2022-05-12 15:58:08 +00:00
Pat Manning
27bfcaa651 Update drop target button alignment across devices.
Fix: 229789612
Fix: 231711806
Fix: 231706480
Fix: 232063941
Fix: 232283628
Test: manual.
Change-Id: I75d649b953ad1607dbba87a8f758884ff938b6dc
2022-05-12 13:49:58 +00:00
Pat Manning
25d5334a9d Re-land "Update workspace, cell layout, shortcut and widget, and cell size calculations."
This reverts commit 3e8a04b341.

Reason for revert: b/230862148

Change-Id: I7462e86643816f42fc72e40defffd58a1f77ee8b
2022-05-12 11:57:01 +00:00
Alex Chau
1fe83fe881 Tune overview icon size and paddings
- Tune overview icon size and paddings across form factors
- Limit handheld overview to 70% of screen width

Fix: 209981696
Test: manual
Change-Id: I946b9bb2e9eb05cdc1e4497b9b1267a91731a8e1
2022-05-11 16:35:14 +01:00
Thales Lima
425f6828f1 Fix hotseat width to span a number of columns
Fix: 227344807
Fix: 231283023
Test: manual
Change-Id: Iad0f38c2323be6d9752a8e509fc7e1164edbcf4e
2022-05-11 10:09:03 -03:00
Sunny Goyal
89a89d63a4 Revert "Fix hotseat width to span a number of columns"
Revert submission 17983445-hotseat_span

Reason for revert: b/231283023
Reverted Changes:
Ice4e37929:Fix hotseat width to span a number of columns
I9ed508490:Fix hotseat width to span a number of columns

Change-Id: Iabf67c5efd8155131a0c8a88192ddd671a43747b
2022-05-09 19:32:07 +00:00
Sunny Goyal
3e8a04b341 Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations."
This reverts commit b45d6c421d.

Reason for revert: b/231283023

Change-Id: Ic4941ea9ecd382348aae8e099e5a7ebf4ed0bba3
2022-05-09 19:31:45 +00:00
Pat Manning
b45d6c421d Update workspace, cell layout, shortcut and widget, and cell size calculations.
Test: DeviceProfileGridDimensionsTest.kt
Fix: 230862148
Change-Id: Ib1d577bf21beb45b2f8b3d4bd57e72c188e0f71b
2022-05-04 15:39:03 +01:00
Thales Lima
828875cd12 Fix hotseat width to span a number of columns
Bug: 227344807
Test: manual
Change-Id: Ice4e37929bcbb8c9cf3af340e67b6bec002578bd
2022-04-29 14:56:30 +00:00
TreeHugger Robot
84bff57d8d Merge "Move spring loaded scale calculation to DeviceProfile." into tm-dev 2022-04-27 13:51:59 +00:00
Alex Chau
a2fc764405 Update overview actions alignment
- Align overview actions to the top with a defined margin below task thumbnail, except for vertical bar layout
- In modal state, use task view's bottom as pivot, and expand using all the space about pivot
- Simplified overview actions margin calculation and moved some logic to DeviceProfile

Bug: 209981696
Test: manual on various devices
Change-Id: I4c96cb02c6f3d6adf30633ddeb883bc4eec16f36
2022-04-25 19:20:21 +01:00
Pat Manning
a2e1499a2f Move spring loaded scale calculation to DeviceProfile.
Fix: 229838395
Test: manual
Change-Id: I6dbbc850e88aaacceb1363e342404b06104f8c10
2022-04-25 18:58:09 +01:00
Pat Manning
de5d9718ed Merge "Prevent edit state workspace scale from hiding next pages." into tm-dev 2022-04-20 17:21:31 +00:00
Pat Manning
ea5c1d29fe Prevent edit state workspace scale from hiding next pages.
Fix: 228969651
Test: manual
Change-Id: I0cceb3bfab19e0721b21fb8c55fe1218b1f25af8
2022-04-20 14:41:46 +01:00
Thales Lima
ee80d6919e Merge "Make hotseat RTL aware" into tm-dev 2022-04-19 16:47:52 +00:00
TreeHugger Robot
833c210550 Merge "Clone mInsets when copying DeviceProfile to taskbar" into tm-dev 2022-04-07 13:44:14 +00:00
Alex Chau
e0227551cf Clone mInsets when copying DeviceProfile to taskbar
- Set mInsets with windowBounds.insets when initialized, and set windowBounds.insets when cloning DeviceProfile
- Added more bottom sheet / all apps in DeviceProfile dump
- Also dump taskbar's device profile in dumpsys

Fix: 226968237
Test: Taskbar AllApps should have correct top padding
Test: adb shell dumpsys activity com.google.android.apps.nexuslauncher
Test: adb shell dumpsys activity service com.google.android.apps.nexuslauncher/com.android.quickstep.TouchInteractionService
Change-Id: I7739c699fb16544b92dc820354a643f745694c25
2022-04-06 19:44:43 +01:00
Pat Manning
08610ca583 Adjust workspace grid and cellLayout paddings.
This is a partial revert of ag/17540098

Bug: 202971709
Test: manual
Change-Id: Ia49e48f336bcca906aae6b014d88f10421b83d0c
2022-04-06 13:10:50 +01:00
Pat Manning
de25c0db36 Adjust edit state drop targets and workspace scaling per device type and orientation.
This is a partial revert of ag/17540098

Bug: 202971709
Test: manual
Change-Id: I0a642f932afd75e47ce11a2c1ee94643d1a67e0c
2022-04-05 20:56:03 +00:00
Thales Lima
612230dbd3 Make hotseat RTL aware
Fix: 217567306
Test: manual, turning on "Force RTL"
Change-Id: I1369cfc6e9afd328a1a6945469064d4cd54f31ea
2022-04-04 13:32:10 +01:00
Pat Manning
5575dfeaad Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev 2022-04-01 02:05:41 +00:00
Thales Lima
c1ea50a43d Merge "Make inline qsb part of grid attrs" into tm-dev 2022-03-31 08:30:10 +00:00