Commit Graph

6289 Commits

Author SHA1 Message Date
Jeremy Sim
a7ce667e3a Merge "Fix launch flow when one app in an app pair is paused" into main 2024-04-05 21:30:09 +00:00
Sunny Goyal
21f498c5f3 Merge "Moving all configs from overrides.xml to config.xml" into main 2024-04-05 20:04:15 +00:00
Jeremy Sim
17db14b107 Fix launch flow when one app in an app pair is paused
This CL changes the error handling logic in ItemClickHandler to continue with app pair launch when only one app in an app pair is paused. It also changes AppPairIconGraphic so that the disabled state of the app pair is drawn modularly (if only one app is paused, only one app will appear visually paused).

Bug: 330795643
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85
2024-04-05 11:24:33 -07:00
Sunny Goyal
bd07c05446 Moving all configs from overrides.xml to config.xml
> Removing some used configs
> Moving ids to id.xml

Bug: 330920490
Flag: None
Test: Presubmit
Change-Id: I86bd22db49a3980c55f5d42350a7c6368fa86d21
2024-04-05 11:20:17 -07:00
Zak Cohen
02f0c92ea8 Merge "Widget Picker - center text description vertically to align with add button" into main 2024-04-05 16:46:44 +00:00
Brandon Dayauon
c752dd032c Merge "Ripple to header and button when click happens" into main 2024-04-05 04:20:49 +00:00
Jeremy Sim
324c2478d8 Merge "Update app pair icon colors when switching containers" into main 2024-04-05 00:00:56 +00:00
Zak Cohen
106cd240de Widget Picker - center text description vertically to align with add button
Bug: 332287648
Test: Widget picker tests
Flag: NA bug fix
Change-Id: I4d600633c3cfdc40973134903f4ba7a04090ccfe
2024-04-04 15:59:00 -07:00
Zak Cohen
ea3fe15fa8 Merge "Widget Picker - Always center add widget button text vertically" into main 2024-04-04 22:19:21 +00:00
Jeremy Sim
05617cb11f Update app pair icon colors when switching containers
This CL updates the color for the app pair background, and adds a way for an app pair icon to redraw as a different color when switching containers.

Bug: 315731527
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I615cb95d51f7c4c120ad306246d9491bf4452229
2024-04-04 15:07:30 -07:00
Jeremy Sim
e261ecbbd1 Merge "Update to correct Material SurfaceContainer values" into main 2024-04-04 21:59:32 +00:00
Brandon Dayauon
c3281ee18a Ripple to header and button when click happens
bug:320701510
Test: manual video: https://drive.google.com/file/d/11X7vUetuMN1J34Now4zlQZ0WaOnryLpA/view?usp=sharing
Flag: None

Change-Id: Ibe22d02b59da5b1133f02ebd936520b97a63e44a
2024-04-04 14:08:41 -07:00
Hyunyoung Song
d0eb878d90 Merge "Add 16dp between nav bar and container by setting extra padding to the recyclerView." into main 2024-04-04 18:33:52 +00:00
Vinit Nayak
247c6ac8ec Merge "Allow app pairs in folders" into main 2024-04-04 17:55:34 +00:00
Zak Cohen
d00650bec3 Widget Picker - Always center add widget button text vertically
https://screenshot.googleplex.com/6aLoQSeADh2Ds6V

Bug: 331493703
Test: screenshot tests
Flag: NA layout bug fix
Change-Id: I6399474c42d3cd8ee172bbbbc0789044aac8cbe0
2024-04-04 10:01:18 -07:00
Shamali P
8f44617191 Remove unused badge logic on WidgetCell now that we don't show badges.
See ag/26786552 that removed the usage.

Bug: 331838199
Test: Manual validation
Flag: N/A
Change-Id: I4393df1f8c6c7568925428bb3489081df17aa623
2024-04-04 13:10:00 +00:00
Jeremy Sim
b35769003e Update to correct Material SurfaceContainer values
This CL fixes a bug where all surface_container color values (highest, high, surfaceContainer, low, lowest) were set to the same color value (the surfaceContainer value). Reference values taken from Android color token library at https://www.figma.com/file/o26ZXcRCR6gv0mEdl7Ix53/%5BAndroid-U%5D-Fog?type=design&node-id=4441-6849&mode=design&t=hXj4we7EkD8GWsD0-0

Bug: 315731527
Flag: none
Test: none
Change-Id: Ib6fa7739e6d644ea9a6e5cb388678a51926c7b71
2024-04-03 18:35:05 -07:00
Jeremy Sim
a596f589c4 Allow app pairs in folders
This CL substantially refactors folders to be able to take contents of type AppPairInfo. App pairs can now be moved in and out of folders, and launch from folders.

This CL contains only logic and model changes; animation and style changes (for dropping items into folders, color changes to app pair surfaces, etc.) will be in a following CL. Another CL (hopefully) will contain tests. I'm planning to submit them together, but this patch should also be able to stand alone with no issues (except janky transitions).

Bug: 315731527
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual, more to follow in another CL.
Change-Id: I73732fcaefbdc61bf6e02a5be365962b8bbc3e41
2024-04-03 16:47:42 -07:00
Bill Yi
4988629481 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1215dc2f61a3d6278658212749aec75edf4eff1a
2024-04-02 00:27:10 -07:00
Treehugger Robot
9f599f0636 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-29 22:36:18 +00:00
Brandon Dayauon
4958ecfadb Merge "Move adding views logic to privateProfileManager" into main 2024-03-29 04:03:42 +00:00
Brandon Dayauon
391e53d2fc Merge "Fix private space settings cog margin" into main 2024-03-29 01:08:43 +00:00
Brandon Dayauon
136f9d6f8a Move adding views logic to privateProfileManager
- Have the animation happen according to the state of private space.
- Have the transition happen only once by setting the current transition to null at the end of transition and by ensuring
where the transitions are allowed.
- Removing controller class.

- The onClick controls the enablement of the profile. On reset (when getting the transition) is what controls the animation
during expand.

tldr- In the collapse case:  execute() is called -> animation happens  -> addPsHeader
tldr- Expand case: post() is called -> addPsHeader -> animation happens.

Collapse:
onClick() -> AACV.onAppsUpdated() that resets & apply/RUNS runnable because EXECUTE
-> AAList.onAppsUpdated() (which is called at the same time animating happens which we should cancel and do at end callback)
-> AAList.onAppsUpdated() gets called again

Expand:
onCLick() -> AACV.onAppsUpdated() that resets & apply runnable
-> AAList.onAppsUpdated() (no animation running)
-> AAList.onAppsUpdated() (no animation running)
-> addPrivateSpaceHeader
-> then unlockAction() runnable because its posted at this point

bug: 326206132
bug: 330444548
bug: 299294792
Test: manually locally and presubmit: https://screenshot.googleplex.com/9wavvwKQ8hY6oUw & https://screenshot.googleplex.com/BiqmidLFjPwS28j
video: https://drive.google.com/file/d/1XGhmTncdUFtJj188_l7alGyyNz_fhXNw/view?usp=sharing

Scrolling fix before: https://drive.google.com/file/d/1XykDm4UELoCvcwZdj8ZlJ6TszptB8W0W/view?usp=sharing
scrolling fix after when not a lot of apps: https://drive.google.com/file/d/1Y4VY1eX7WE8ShSLXRrT56ieBdAuJo_zn/view?usp=sharing
scrolling fix after with a lot of apps: https://drive.google.com/file/d/1Y58c-Z9xnU1GILp0Ih-oLORXYkMB-jWn/view?usp=sharing
Flag: ACONFIG com.android.launcher3.Flags.private_space_animation

Change-Id: I8d03ae60e2c9fe0ec145c4b0a2e9604b9e6e9017
2024-03-28 17:39:42 -07:00
Brandon Dayauon
7e50fa9624 Fix private space settings cog margin
Inset on the lock button already exists, so in reality there are 4dp +
8dp margin from the settings button. To fix this, we can just reduce
8dp -> 4dp on the settings button.

bug: 331742915
Test: before: https://drive.google.com/file/d/1z6-U5eO5oM6h6uULNdmJciMCP_F33rDn/view?usp=sharing
after: https://drive.google.com/file/d/1yzCysJRaRKDp0kivhi6GWE83qsloh39U/view?usp=sharing
Flag: none
Change-Id: Iafb1101b8029398c139ba02f31a027db272132f3
2024-03-28 22:01:55 +00:00
Stefan Andonian
f6867d48d9 Merge "Make "Undo" button not be long-clickable explicitly." into main 2024-03-28 20:00:11 +00:00
Stefan Andonian
462c80831c Merge "Explicitly set the Hotseat to not long or short clickable." into main 2024-03-28 19:59:27 +00:00
Bill Yi
c18cafda4a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I725d6479c36e7ee0e9978eef413a76dd431aa67d
2024-03-28 12:08:06 -07:00
Brandon Dayauon
bdb5836ada Add 16dp between nav bar and container by setting extra padding to the recyclerView.
bug:298593161
Test: manual:
(Adjusting bottom padding of recyclerView):
3button nav after closed: https://drive.google.com/file/d/1xTXtzOC-n3_vGXs34FjL_52jiY60piAA/view?usp=sharing
3button nav after opened: https://drive.google.com/file/d/1xS4Wu41-4ogYzVRh1UxDW39DZW214vSz/view?usp=sharing
gesture nav after closed: https://drive.google.com/file/d/1xQGL-Qi5sGwWqQsOLQAsvxpNlJGklBSg/view?usp=sharing
gesture nav after opened: https://drive.google.com/file/d/1xQ9YNUv89RsT9Tsa85BlEt64twDHk-l6/view?usp=sharing

(USING DIVIDER METHOD):
3button nav after closed: https://drive.google.com/file/d/1YG1pFmU4023-wO2okC_wkwsW5L8IUTkl/view?usp=sharing
3button nav after opened: https://drive.google.com/file/d/1YCBIqzFkxNH9fNuE0o2YTz_221ZRAmSA/view?usp=sharing
gesture nav after closed: https://drive.google.com/file/d/1YIBRglQk6SsSe7_nbggcQZBE7aERGT74/view?usp=sharing
gesture nav after opened: https://drive.google.com/file/d/1YGzbgQPRFKhuSZ95BF6fx_8NfPyocCxN/view?usp=sharing
Flag: ACONFIG com.android.launcher3.Flags.enable_private_space

Change-Id: Ibfd4896c1477b3e498389d6451ca458a01d98952
2024-03-27 11:01:22 -07:00
Holly Jiuyu Sun
84f8002586 Merge "[PS] Update PS tile subtitle." into main 2024-03-26 20:42:48 +00:00
Sunny Goyal
bd7ec3335b Using xml override instead of code swap for predicted icon
Bug: 330920490
Flag: None
Test: Presubmit
Change-Id: I5ff52464b931630da003fb6aeff2a4fd9d2dd3b3
2024-03-25 15:18:48 -07:00
Bill Yi
c5307ee6ce Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-22 17:00:35 +00:00
Holly Jiuyu Sun
7afab539c0 Merge "[PS] Use onSurface for tint." into main 2024-03-22 05:50:32 +00:00
Bill Yi
6748806bfb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iec7905df8c578857093c7a835a6aa336f17a30d3
2024-03-21 20:27:17 -07:00
Anushree Ganjam
6dadf21a7f Add FastScrollSectionInfo with "info icon" when work educard exists.
Before: https://b.corp.google.com/issues/325490294#comment1

After: https://b.corp.google.com/issues/325490294#comment5

Bug: 325490294
Test: Manual
Flag: NA
Change-Id: I557971cddd5829f46697004159d62a9343e75f69
2024-03-21 12:29:47 -07:00
Holly Sun
44d2299ee7 [PS] Use onSurface for tint.
Screenshot:
https://screenshot.googleplex.com/6WSZJGdT9hY2Ww5
https://screenshot.googleplex.com/AiTX4JJjfRyfvPc

Bug: 325068252
Test: manual
Flag: aconfig enable_private_space trunkfood
Change-Id: I36bcf1156149630450ca3dfc063984e3deb6851f
2024-03-21 11:52:26 -07:00
Stefan Andonian
83578d13fa Explicitly set the Hotseat to not long or short clickable.
Bug: 318316718
Test: Verified this is no longer selected by switch access.
Flag: NA
Change-Id: I45a815ab816f9835e297d06eb1f5d0edcb29d837
2024-03-21 17:54:41 +00:00
Stefan Andonian
e38a890b20 Make "Undo" button not be long-clickable explicitly.
This is causing accessibility bot issues for the switch access
feature.

Bug: 319369664
Flag: NA
Test: Verified via go/web-hv that this is no longer long-clickable.
Change-Id: I8a90d7093b60ddecdecc3374a34ce6828c1b7468
2024-03-21 17:46:55 +00:00
Helen Cheuk
8944afda32 Merge "Disable default focus highlight for Folder to fix the incorrect border issue" into main 2024-03-21 12:30:46 +00:00
Helen Cheuk
8896580b58 Merge "Change single stroke focus outline to double stroke" into main 2024-03-21 12:09:19 +00:00
Holly Sun
2509fa72f2 [PS] Update PS tile subtitle.
Screenshot: https://screenshot.googleplex.com/4mUyLoXh5zHchgx
Test: manual
Flag: aconfig com.google.android.apps.nexuslauncher.enable_inject_private_space_tile trunkfood
Bug: 324585814
Change-Id: I22a5448632cf1db628953287ba6ad362165e5351
2024-03-20 14:20:56 -07:00
Shamali Patwa
eef12ba5b7 Merge "Retain recommendations (if possible) while picker is open" into main 2024-03-20 00:41:41 +00:00
Shamali P
b081314330 Retain recommendations (if possible) while picker is open
Picker rebinds recommendations when size constraints change or
fold/unfold, but recommendations from popup provider may have changed.
This is an attempt at trying to maintain currently shown items
as much possible.

Also, align the pagination and title to the top in two pane picker
 (confirmed with David that we prefer this version)

Additionally, we don't show the widgets count for suggestions.

Bug: 318410881
Flag: ACONFIG com.android.launcher3.enable_categorized_widget_recommendations DEVELOPMENT
Test: Manual

Change-Id: I60799f9ad38da913c3e084d758f5b82c79cd641c
2024-03-19 21:26:14 +00:00
helencheuk
51ec59dd1f Disable default focus highlight for Folder to fix the incorrect border issue
Agreed with UX that removing visible focus on first ESC keypress is the expected behaviour
So it is disabled in this CL to avoid the square corner focus state

Bug: 329892471
Test: Manual
Flag: N/A
Change-Id: I721bf0916374842c582b6b6523cc4cd5ce78fc02
2024-03-19 18:13:24 +00:00
Fengjiang Li
c19e337202 Merge "[Predictive Back] Support WidgetsTwoPaneSheet" into main 2024-03-19 01:53:10 +00:00
Fengjiang Li
c51363fc46 [Predictive Back] Support WidgetsTwoPaneSheet
Fix: 325930715
Test: Manual - attached video to bug
Flag: aconfig com.android.launcher3.enable_predictive_back_gesture TEAMFOOD
Change-Id: I44098de12253f803526160bce6457a940b2153c7
2024-03-18 15:31:13 -07:00
Willie Koomson
078737f22b Merge "Add tap-to-add button to widget picker" into main 2024-03-15 23:26:05 +00:00
Shamali Patwa
61adb489d1 Merge "Distribute the padding between search&rec container and tabs/applist" into main 2024-03-15 22:42:23 +00:00
Bill Yi
88fea708b2 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-15 20:30:19 +00:00
Willie Koomson
cdc26951ff Add tap-to-add button to widget picker
This change introduces an "Add" button that appears when a widget
preview is clicked in the widget picker. This button disappears when the
preview is clicked again, or another preview is clicked. When the button
is pressed, it adds that widget to the picker. The add button is
available in the app-specific widget sheet as well.

Bug: 323886237
Test: Manual
Flag: ACONFIG com.android.launcher3.enable_widget_tap_to_add DEVELOPMENT

Change-Id: I86a8a4c22119960c54a885fd2efeb91916b4f9a0
2024-03-15 20:10:45 +00:00
helencheuk
7b83b8e011 Change single stroke focus outline to double stroke
Add paint for inner stroke, add padding for launcher widget

Bug: 327386149
Test: Manual
Flag: ACONFIG com.android.launcher3.enable_focus_outline Teamfood
Change-Id: I59cf1088209370b89f2faffdab80787f1b0c1e3b
2024-03-15 18:16:20 +00:00