Commit Graph

469 Commits

Author SHA1 Message Date
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
Thales Lima
12d0eff037 Make inline qsb part of grid attrs
This should make it more configurable, and be independent of the screen size set by the user.

Fix: 223726518
Test: atest Launcher3Tests:HotseatSizeTest
Test: atest Launcher3Tests:InlineQsbTest
Change-Id: If04f3fb0f556103f60b580c757a9fc06da561516
2022-03-30 20:57:57 +01:00
Thales Lima
080d890383 Add border space to all apps cells
Also remove tablet condition, phones should also follow the workspace size.

Fix: 218638090
Test: visual and HSV
Change-Id: Ib201011391c28c0f1dcd0ce8645c3191655a7227
2022-03-30 11:56:27 +01:00
Pat Manning
e372366bb3 Revert "Adjust edit state drop targets, workspace scaling, and m..."
Test: manual

Revert submission 17004675-edit-state

Reason for revert: b/226274309
Reverted Changes:
Ib50509b6f:Adjust edit state drop targets per device type and...
Id1817cd3c:Adjust edit state drop targets, workspace scaling,...

Change-Id: I22863d7735f49f6a040a17cf56cc66f20a3e0986
2022-03-28 08:24:54 -04:00
TreeHugger Robot
b8e0d2c052 Merge "Aligning Hotseat and Workspace icons in vertical bar mode" into tm-dev 2022-03-24 09:23:50 +00:00
Sihua Ma
38bb3b0c5c Aligning Hotseat and Workspace icons in vertical bar mode
Changing the padding of the Hotseat Bar to align the hotseat icons with the Workspace icons.

Test: Manual
Fix: 223553482
Change-Id: I7939c3a900dfe22d2ce3f71d408f1d2778a0af2a
2022-03-23 18:27:41 +00:00
Thales Lima
042482e94c Merge "Change size of All Apps bottom sheet" into tm-dev 2022-03-22 15:25:50 +00:00
Thales Lima
b7ef569591 Change size of All Apps bottom sheet
This brings the size of the bottom sheet closer to the spec provided by UX. For that type of flexibility to be possible, more attributes are introduced and some calculations had to be changed.

This shouldn't affect phones.

Bug: 218638090
Test: visual, with dumpsys and HSV
Change-Id: Ieee7580d80d8e100837b1cdd7a1455c4d65612dc
2022-03-22 12:19:46 +00:00
Thales Lima
60dc19cb71 Merge "Fix height of hotseat" into tm-dev 2022-03-22 11:43:13 +00:00
Thales Lima
7d14923195 Fix height of hotseat
Hotseat size was going behind workspace unnecessarily, causing some issues and also had the wrong hotseat height which was cutting the icons in folders.

Fixes: 224713923
Fixes: 221101290
Test: manual
Change-Id: I2646abc4a6aaa5bf2ea85e55e2f3618f8d7efd9b
2022-03-21 18:32:22 +00:00
TreeHugger Robot
016dd3656d Merge "Adjust edit state drop targets, workspace scaling, and margins per device type and orientation." into tm-dev 2022-03-21 17:07:10 +00:00
Thales Lima
2017ee0208 Merge "Correct inline qsb for foldables" into tm-dev 2022-03-21 14:30:19 +00:00
Pat Manning
1acf2b18af Adjust edit state drop targets, workspace scaling, and margins per device type and orientation.
Bug: 202971709
Test: manual
Change-Id: Id1817cd3c7e7bfa5b0aa8aa20565b791ad871f64
2022-03-18 17:43:28 +00:00
Alex Chau
a6907dc8c9 Use correct config.smallestScreenWidthDp when creating Resource in DeviceProfile
- This is a regression from ag/17070486 when tested, likely because DeviceProfiles are no longer re-created when changing display sizes, so correct values need to be calculated on the starting state

Bug: 221961069
Test: verify smallestWidth specific resource on changing display sizes
Change-Id: I1539bad4b35b36f0056d59307ab5fbec23a71f49
2022-03-18 15:24:07 +00:00
Thales Lima
2903a624ce Correct inline qsb for foldables
Fixes 223565967
Test: manual and HSV

Change-Id: I40ef17142f90a8b29cdec44a36249eb2b800734a
2022-03-17 13:52:19 +00:00
Andras Kloczl
142b054e06 Tune widget picker bottom sheet VisD for large screen
Test: Open widget picker by long pressing the home screen.
Open app specific widget picker by long pressing an app icon
that has widgets. Try both landscape and portrait, also on
phone/tablet/foldable.
Bug: 214215594

Change-Id: I7b4b3a8d7421f1d4df84d49a18b465693a17bd7b
2022-03-15 14:01:59 +00:00
Alex Chau
19c6eca5c5 Use overview_actions_height from Resources to calculate OverviewActionsView alignment
- startActionView.getHeight() isn't ready when updatePaddingAndTranslations is called, so use overview_actions_height from Resources through DeviceProfile instead.

Fix: 218442870
Test: Restart launcher, go to overveiw from app, rotate and rotate back, overview actions stays in same position
Change-Id: Ia5e234f73100a2f418c17222145a8f993cbfab8a
2022-03-10 20:16:59 +00:00
TreeHugger Robot
d586e1948b Merge "Updating window manager estimation logic:" into tm-dev 2022-03-09 22:24:12 +00:00
Sunny Goyal
187b16cb91 Updating window manager estimation logic:
> Moving the code from ApiWrapper to Resource overlays for better maintainability
> Accounting for display cutouts in insets estimation
> Using same logic in display controller and view inset dispatching

Test: Verified on device
Bug: 221961069
Change-Id: I78466353563692ce3f7512b0146ef8b61ef14bc0
2022-03-09 11:15:58 -08:00
Alex Chau
8175da9644 Shrink hotseat icons size in large tablet portrait
Fix: 214882090
Test: large tablet shrink hotseat icons size in both orientation
Test: Launcher3 without inline QSB does not shrink hotseat icon size
Change-Id: I5e325924aae056d42f01c08624b97a57359dbf08
2022-03-09 13:36:23 +00:00
Alex Chau
6ed408f59f Use less icons in hotseat when in 3 button nav for tablet
- We have less space on tablets when 3 button nav is enabled because QSB is now inline with the icons. This creates a new attribute to define how many icons should be shown when in that mode. This could be used for other grids in the future as well.
- InvariantDeviceProfile now listens for nav mode changes

Fixes 214882090, 221420204
Test: manual

Change-Id: I012432a1a322c4e5505e46a1198c841ab124aaa6
2022-03-07 18:38:05 +00:00
TreeHugger Robot
c089baa668 Merge "Remove Taskbar and Taskbar EDU flags." into tm-dev 2022-02-23 20:10:02 +00:00
Vinit Nayak
58c27cce73 Remove Taskbar and Taskbar EDU flags.
Bug: 219035565
Change-Id: I643b5d006b5759723418901ffeb463fa04a82cbc
(cherry picked from commit ec4adc1d5a)
2022-02-23 18:14:28 +00:00
Alex Chau
b8c22e1155 Tune AllApps bottom sheet VisD and motion
- Make AllApps bottom sheet solid and appears from bottom
- Teleport AllApps bottom sheet as user drag to reduce drag range
  - Consider teleport interpolation for state transition sdetection
- Tuned workspace motions for AllApps bottom sheet (no translate, shrink)
- Add portrait vertical translate for tablet portrait including taskbar AllApps
- Updated bottom sheet handle and created common variables for other bottom sheets

Bug: 208599118
Test: manual on tablet AllApps, taskbar Allapps and handheld AllApps
Change-Id: I69dba5f155914cd012cc8ef3be1ef71fb2be5a40
2022-02-23 17:08:06 +00:00
Brian Isganitis
099945b075 Add predictions row to taskbar all apps.
- We need to listen to DeviceProfile changes in case the number of
  columns changes in the grid. I made an interface/mixin separate from
  ActivityContext to avoid polutting the latter with too many things. I
  also applied this change to existing taskbar A-Z grid.
- Added all apps visited count to onboarding preferences for only
  showing "All Apps" label in place of divider 20 times. Label is also
  tracked on taskbar side and should be kept in sync.

Test: Manual
Fix: 216843395
Bug: 174174514
Change-Id: I97aa91397c334123626caf18251f19e17c7104fb
2022-02-14 11:24:16 -08:00
Thales Lima
116b51a999 Tune homescreen paddings
Also change the number of hotseat icons back to 6 on large screens

Fixes 210118169
Test: visual, Window VQA and HSV

Change-Id: I9a408f17080a558c2030805dd822f26e3c846e5d
2022-02-03 16:19:47 +00:00
Alex Chau
6a7d1e2ad1 Don't apply nav bar insets in tablets
- With flexible inset changes in T, taskbar is no longer inseted in getCurrentSizeRange, i.e. DeviceProfile.availableHeight no longer inset nav bar size
- In order for home screen sizes to be calcualted correctly, avoid inseting nav bar in LauncherRootView
- Only apply a bottom padding with stashed taskbar size to necessarily surfaces (Overview)
- Home screen icon overlap will be fixed in separate CL

Bug: 215528237
Test: maual in tablet gesture nav and 3 buttons
Change-Id: I9bc796ba059159e819f8cd121ddabab96c8113d2
2022-02-01 13:08:49 +00:00
Brian Isganitis
c13700b61e Merge changes I2ede15d8,I86a0ffc0,I7c5fdbc7
* changes:
  Do not scale down taskbar all apps icons.
  Inflate taskbar all apps in abstract slide-in view.
  Introduce initial A-Z app drawer to taskbar.
2022-01-29 03:00:45 +00:00
Brian Isganitis
25b2ac8527 Do not scale down taskbar all apps icons.
Test: Manual
Bug: 204696617
Change-Id: I2ede15d8beaef65661984fe63bd99d0e7e726774
2022-01-28 16:43:24 -05:00
Alex Chau
635b3abcf1 Remove ENABLE_OVERVIEW_GRID feature flag
- Use isTablet directly instead of overviewShowAsGrid
- Tablet/landscape resoruces can now be overriden via xml
- Use Landscape resources in tablet in additional to vertical bar layout
  - For resources overwritten in values-land that was intended for vertical bar layout, override them in sw600dp for tablet landscape

Bug: 210597891
Test: manual
Change-Id: I19eac935a5fb1a420485408aa8b4774632726af1
2022-01-27 11:28:35 +00:00
Alex Chau
dfc8ddff87 Manually apply nav bar insets in DeviceProfile for tablets
- With flexible inset changes in T, taskbar is no longer inseted in getCurrentSizeRange, i.e. DeviceProfile.availableHeight no longer inset nav bar size
- In order for home screen sizes to be calcualted correctly, inset nav bar manually in DeviceProfile

Bug: 215528237
Test: maual in tablet gesture nav and 3 buttons
Change-Id: Ia7d518613eb843f4c45ed77cefc906d7124cb367
2022-01-25 14:11:07 +00:00
Thales Lima
ec951f7f2c Merge "Make hotseat fit one line on tablets" 2022-01-25 14:03:34 +00:00
Thales Lima
a1012904bb Make hotseat fit one line on tablets
When running on tablets in landscape, the QSB should inline with the hotseat icons. This does that and fixes small bugs that didn't account for the new hotseatBorderSpace.

Bug: 210118169
Test: atest Launcher3Tests:DeviceProfileTest
Test: visual, using HSV and Window
Change-Id: I5a89c5449bf59fde736618151eceaacca443ef67
2022-01-21 17:42:48 +00:00
Alex Chau
27b39b9668 Put AllApps in bottom sheet for tablets
http://screen/7steQ7W8U2ga3Hs

Bug: 208599118
Test: manual
Change-Id: I36cbac3cb7cb214081e5a33a6e042ae83e745f23
2022-01-19 18:57:34 +00:00
Thales Lima
9df1ba0847 Merge "create 6x5 scalable grid for tablets" 2022-01-14 12:21:58 +00:00
TreeHugger Robot
27981bac2a Merge "Allow column size of search container to be configured" 2022-01-07 18:35:13 +00:00
Thales Lima
dd027348dd create 6x5 scalable grid for tablets
Create more attributes for landscape and fix the space between icons in the hotseat. The dimensions are correct but some size might differ from mocks because of device scaling, qsb position and insets not finalized.

Bug: 210118169
Test: visual, using HSV and Window
Change-Id: Ie505923dce2e30133eb1e5c9c83c33a2895147f2
2022-01-07 12:54:37 +00:00
Thales Lima
bb7d3881fe launcher: more options for all apps icon sizes
Different postures now require different icons sizes, changes in spaces and text size. This should give enough options to change the sizes in All Apps the same was as in the home screen.

Bug: 202708085
Test: visual, using HSV and Window
Change-Id: I40a28f27a19b5728a950a4b43f4239c1ba26c2a4
2022-01-05 15:55:16 +00:00
Thales Lima
6e7f36c86a add attributes for hotseat space
Hotseat now follows the size of workspace icons and should have different spaces based on the grid and posture of the device. It also has more icons.

Fixes: 204488528
Test: HSV and Window
Change-Id: I534df95dda6dc7de3f810632f2cab3822bf78416
2022-01-05 12:54:53 +00:00
Thales Lima
85c942fcc9 rename display-option attributes
Rename the attributes to make it more standardized and to be easier to check the multiple variants.

Bug: 202708085
Test: compile and run different launchers
Change-Id: I18b981877b9160bd3801a02567d52b49747d50d4
2022-01-05 10:54:29 +00:00
TreeHugger Robot
5c7a0ae1c9 Merge "DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks" into sc-v2-dev am: 953873dd18 am: a370c8880f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440097

Change-Id: I5ce9a676cd30790b89a5a63ffbbc390c602f7f7e
2021-12-11 02:08:36 +00:00
TreeHugger Robot
a370c8880f Merge "DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks" into sc-v2-dev am: 953873dd18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440097

Change-Id: Ifa60729ab1b7cf9031dc03698684879a202ff1f4
2021-12-11 01:51:08 +00:00
Alex Chau
4c98374d99 DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks
Bug: 207350366
Bug: 210158657
Test: manual
Change-Id: I28116407c4267259a75fd39637104cea9db73fe3
2021-12-10 23:29:08 +00:00
Alex Chau
9fee3fd379 Allow column size of search container to be configured
- Added numSearchContainerColumns in grid-option to control search container's width, defaults to numColumns if not specified

Bug: 210127246
Test: manual
Change-Id: I0c2594f0eeab8844dcff9468e603282a09fae0bd
2021-12-10 17:55:51 +00:00
Alex Chau
992db75dae Use percentage scaling for overview thumbnail size
- Limit overview to screen ratio to be at max 70%
- Tuned row spacing and page spacing
- Added 2 more test activities to testOverviewForTablet to avoid dismissing tasks at end of grid, as more grid tasks are now shown

Bug: 207350366
Test: manual
Change-Id: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
Merged-In: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
2021-12-07 14:50:40 +00:00
Alex Chau
a5470710a3 Use percentage scaling for overview thumbnail size am: 4f7952ead4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16389092

Change-Id: I18751b12e2c7fa2b376545a95426594cbadffd07
2021-12-07 14:50:04 +00:00
Alex Chau
4f7952ead4 Use percentage scaling for overview thumbnail size
- Limit overview to screen ratio to be at max 70%
- Tuned row spacing and page spacing
- Added 2 more test activities to testOverviewForTablet to avoid dismissing tasks at end of grid, as more grid tasks are now shown

Bug: 207350366
Test: manual
Change-Id: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
2021-12-07 11:00:48 +00:00
Alex Chau
5ec74a16f0 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
2021-12-06 18:06:27 +00:00
Alex Chau
1bf0fe1b70 Add back screenshot button to Launcher3
- Also make spacing between buttons always 36dp
- Updated screenshot button image for Launcher3

Fix: 208384949
Test: Start overview in Launcher3WithQuickStep, test screenshot button is working
Change-Id: Ieb60ce134813202c1d14137fff0a131e1f5f8c96
2021-12-03 12:32:29 +00:00