Commit Graph
596 Commits
Author SHA1 Message Date
Steven Ng 77940284eb Add a new string for widget configuration drop target
Test: manual. See screenshot in b/201286923
Fix: 201286923
Change-Id: I5be4f723523befe359b922273d11f57fb9f0b3fd
(cherry picked from commit 29f46c9628)
2021-10-06 17:38:03 +00:00
Brian Isganitis 62a6271d9c Load widgets in wallpaper app launcher preview
Test: Widgets in wallpaper app launcher preview rendered
Bug: 185306338
Change-Id: I38569d2ff0b64ba55eb188afa42fba4100aae7ff
Merged-In: I38569d2ff0b64ba55eb188afa42fba4100aae7ff
2021-09-14 15:19:33 -04:00
Sunny Goyal 828154a2b2 Fixing widget not laid-out properly in preview
Bug: 185306338
Test: Manual
Change-Id: Ib1ec8a53e4701f6813813b86bf481b837127a909
Merged-In: Ib1ec8a53e4701f6813813b86bf481b837127a909
2021-09-14 15:14:44 -04:00
Steven Ng bdffb53843 Fix pending restore widget touch issue
After http://ag/14980850, we block updateAppWidget until app widget
is restored. However, PendingAppWidgetHostView constructor relies
on updateAppWidget(null) to trigger set listener in getDefaultView().
We should call super.updateAppWidget(null) in the constructor instead.

Test: manual
Bug: 14980850
Change-Id: I30af9778a636af2ad822e7abc152b6f0bfdea1bf
2021-08-11 22:40:06 +01:00
TreeHugger Robot 6a01fe49a5 Merge "Measure WidgetsFullSheet before estimating the recommended table size" into sc-dev 2021-07-22 18:53:32 +00:00
Steven Ng a606d344a6 Measure WidgetsFullSheet before estimating the recommended table
size

Issue: The header view height was obtained before any measurement.

Test: On Pixel 5 4x5 gird with Photo widget shown in recommended
      table, make the device in landscape. Then open the full widgets
      picker. The widgets picker can be scrolled. Before this fix,
      scrolling is not possible.
Fix: 194172597
Change-Id: Ib30cf4b95d2ed23ff28f3d24e103f0e919b3a551
2021-07-22 16:08:15 +01:00
Brian Isganitis b684c1b59b Revert "Merge "Revert "Use wallpaper colors for widgets in wallpaper change preview"" into sc-dev"
This reverts commit 7de95d6767, reversing
changes made to 0a70a5a690.

Lints have been added to fix errorprone.

Test: Widgets should adapt to wallpaper colors in launcher preview.
Bug: 192205054
Merged-In: I3fb76b6036cb909771b789eac15742df78c2c742
Merged-In: I4da9ad1cc88be251f97e86b6c8c9b346ed20f586
Change-Id: I6866f8521ed427d096f27da0a92d8b40e1099187
2021-07-19 21:03:26 -04:00
Jonathan Miranda 7de95d6767 Merge "Revert "Use wallpaper colors for widgets in wallpaper change preview"" into sc-dev 2021-07-20 00:45:57 +00:00
Jonathan Miranda f5fee1a7d3 Revert "Use wallpaper colors for widgets in wallpaper change preview"
Revert "Implement generateColorsOverride from LocalColorExtractor"

Revert submission 15331418-colorcp

Reason for revert: Broke the build
Reverted Changes:
Ife80b07f9:Use wallpaper colors for widgets in wallpaper chan...
I1371eb787:Implement generateColorsOverride from LocalColorEx...

Bug: 194138049

// Using original change's merged-in tag to avoid clashing
Merged-In: I3fb76b6036cb909771b789eac15742df78c2c742
Merged-In: I4da9ad1cc88be251f97e86b6c8c9b346ed20f586

Change-Id: I3835dfb8efe745dc0a654712a5b1f68c4946f446
2021-07-20 00:44:42 +00:00
TreeHugger Robot 0a70a5a690 Merge "Remove the shadow under PendingAppWidgetHostView." into sc-dev 2021-07-20 00:25:48 +00:00
Pierre Barbier de Reuille a28f864bbf Remove the shadow under PendingAppWidgetHostView.
Fix: 194007734
Test: Manual (see bug)
Change-Id: Ia46dbf8417bb9df17f35b43bfa2698206d940587
2021-07-19 22:21:06 +00:00
Brian Isganitis 74e6ced362 Use wallpaper colors for widgets in wallpaper change preview
Test: Widgets should adapt to wallpaper colors in launcher preview.
Bug: 192205054
Merged-In: I3fb76b6036cb909771b789eac15742df78c2c742
Merged-In: I4da9ad1cc88be251f97e86b6c8c9b346ed20f586
Change-Id: Ife80b07f99da913d65bff96fba2ccd76b0a2ed48
2021-07-19 16:58:20 -04:00
Steven Ng 671ffb88ca Fix class cast issue in AddItemActivity
AddItemActivity is a standalone activity. There is no Launcher activity
instance. Avoid using LauncherAppWidgetHostView in WidgetCell by
replacing it NavigableAppWidgetHostView instead

Test: Check preview layouts are correctly rendered in widgets picker
      and pin widget dialog. Also test drag and drop to verify the
      local color extraction still works when dragging a preview layout
      from widgets picker to home screen.
Fix: 193765783
Change-Id: I3a734a54941257cebcd7b7f6a4c2c9cc764c5c12
2021-07-15 16:06:51 +01:00
Steven Ng 372e85106d Merge "Fix shortcut size calcuation" into sc-dev 2021-07-13 13:59:41 +00:00
Steven Ng 6fe115b2ae Fix shortcut size calcuation
Shortcut size should be the size of all apps icon + padding

Test: Check shortcuts and widgets are shown without crash in the
      following surfaces with display & font set to largest and
      display cutout enabled. Repeat the same test with normal
      display setting and no cutout.
      1. Full widgets picker
      2. Bottom widgets picker
      3. Pin widget dialog
Fix: 193422438
Change-Id: Ibfebf94e92eed5e9cd1dd4196d98823b0e4dda6b
2021-07-13 12:46:31 +01:00
Steven Ng fbb82586a7 Clear WidgetCell#mItem before recylcing a WidgetCell
This fixes a bug which reuses a previous widget item spans to
compute the preview size.

Fix: 193133048
Test: manual
Change-Id: I5459882e258dc010898854dbbe52a6fa8d84796c
(cherry picked from commit 3d27207ff6)
2021-07-12 10:29:56 +00:00
Pierre Barbier de Reuille 6788b73970 Merge changes Id2a8d12e,I06353ba4 into sc-dev
* changes:
  Use the computation of the widget size including padding.
  Avoid calling AppWidgetHostViedw#updateAppWidgetSize
2021-07-02 14:05:08 +00:00
Pierre Barbier de Reuille a7b3a14e75 Use the computation of the widget size including padding.
Found all the uses of getWidgetSizePx and replaced them with the
computation of padded sizes (checked it all made sense).

Test: Try the various widget pickers.
Bug: 191612352
Change-Id: Id2a8d12ee7ce6baabef186dbb78d817975ea2212
2021-07-02 10:04:06 +01:00
Pierre Barbier de Reuille 199aec50ad Avoid calling AppWidgetHostViedw#updateAppWidgetSize
We cannot call it anymore, because the system padding is not always
used.

Bug: 191612352
Test: Manually, using CtsVerifier and dedicated widgets
Change-Id: I06353ba49a8e62127e593cdbcb86fadcf89ecb24
2021-07-02 10:03:44 +01:00
Cyrus Boadway 551b4297ed Use nullable field and boolean rather than optional
Optional won't hold null parameters, so use a boolean flag and
colorschange fields to represent the value and whether changes are
present.

Bug: 190818220
Test: manual
Change-Id: I794507340345864e73f04039f12a035c8053fd96
2021-07-01 15:05:43 +00:00
TreeHugger Robot 25e37a85ae Merge "Correct color extraction on App Widget drop." into sc-dev 2021-07-01 08:31:16 +00:00
Yogisha Dixit f9acf1d5d4 Merge "Log widgets source." into sc-dev 2021-06-30 18:18:12 +00:00
Pierre Barbier de Reuille 43e17301c4 Correct color extraction on App Widget drop.
Disable color extraction on drop until the workspace is back to its
normal size, then re-enable it and force re-coloring. This needs to
happen if the drop is on the workspace, but also if the drop is on the
secondary target.

Fix: 192354264
Test: Manual, see bug for details.
Change-Id: I79203f68843d59384503aa76f4813d886e98afa3
Merged-In: If573641e4bb5a98ed6b5008e00f70f4bbe492c24
2021-06-30 18:50:41 +01:00
Yogisha Dixit 658c5dafd4 Log widgets source.
Test: manual
(1) Upgrading to new DB version is successful (no errors thrown in logcat)
(2) Widgets that were added with the old DB version have CONTAINER_UNKNOWN as their source container
(3) Widgets that are added with the new DB version still log source container after reboot
Bug: 185778648
Change-Id: Iaa38f0be6bc4cb0d29842f9a2ea0d08de000c930
2021-06-30 17:48:14 +00:00
Cyrus Boadway 0d96baec13 Defer onColorsChanged updates during widget-to-home animation
Color change updates recreate the view, which can interfere with the
widget-to-home return animation, specifically the GhostView's use of the
AppWidgetHostView's render node.

Deferring the application of color changes until the end of the
animation allows the widget to settle and remove the GhostView before a
color change might recreate the widget's view.

Bug: 190818220
Test: manual
Change-Id: I6552e583ebb0e4810077d4e70fe9ecb07fd5d01a
2021-06-30 13:10:02 +00:00
Steven Ng d35dcdec05 Merge "Use category icon for pending conversation widgets" into sc-dev 2021-06-29 23:15:04 +00:00
Alina Zaidi 7ed32025f1 Merge "Make sure search recycler view is bound to fast scroller if user is in search mode at the time of attachment of work/personal recycler view." into sc-dev 2021-06-29 18:13:23 +00:00
Steven Ng 12f7a59e5c Use category icon for pending conversation widgets
Fix: 192333050
Test: Manual
Change-Id: Ie3895cd4747f1bec1c8ca9af82347bb0eafa7415
2021-06-29 18:04:09 +01:00
Alina Zaidi 57973c328a Make sure search recycler view is bound to fast scroller if user is
in search mode at the time of attachment of work/personal recycler view.

Bug: 191980945
Test: Tested manually.
1) Open widget picker, scroll.
2) Enable dark mode, scroll.
3) Type search query, scroll.
4) Disable dark mode, scroll.
5) Have work profile in phone and repeat the above with work tab open
and search.

Change-Id: I106717091a88868c4bbe3fad0dd71c8344e9c8ed
2021-06-29 16:32:32 +01:00
Steven Ng 9bb83f65cb Merge "Set the widget preview title a11y text to "{widget name} widget"" into sc-dev 2021-06-29 14:25:13 +00:00
Steven Ng 85486d1c2c Set the widget preview title a11y text to "{widget name} widget"
Fix: 187376680
Test: Manual
Change-Id: I211d8e2b437091808d1f5a764075af4c3832ef48
2021-06-29 12:12:43 +01:00
Steven Ng fbe1836627 Extract common measurement in widgets pickers to its base class
Bug: 191644950
Test: 1. Open the full widget picker. Observe the clock widgets'
         previews are shown properly. Then, rotate the screen and
         observe the clock widgets' previews are shown properly.
      2. Open the bottom widgets picker for clock. Observe the
         clock widgets' previews are shown properly. Then, rotate
         the screen and observe the clock widgets' previews are shown
         properly.
      3. Repeat 1, 2 after changing the system navigation from button
         to gesture.
Change-Id: I564fc2ce0baf3103ae77499380ad69ec38ac6930
2021-06-28 14:55:27 +01:00
Steven Ng bf60673bbb Merge "Fix rounded corners for shortcut & generated preview shadow box" into sc-dev 2021-06-26 22:38:51 +00:00
Alina Zaidi 50401e31bd Merge "Compare maxSpanSize for WidgetsListContentEntries when updating visible entries in widget picker." into sc-dev 2021-06-26 18:04:19 +00:00
Alina Zaidi 57cdcceb07 Merge "Remove scrim from navigation bar from full widget picker." into sc-dev 2021-06-26 18:01:23 +00:00
Alina Zaidi 0b320545f8 Compare maxSpanSize for WidgetsListContentEntries when updating visible
entries in widget picker.

This is so that widgets are rearranged according to maxSpanSize in
widget table

Bug: 191336852
Test: Manually rotated widget picker with one of the headers expanded
and checked that widgets in widget table adjust according to screen's
horizontal size.

Change-Id: I2406ca9eccd18f4bb32b396acaa188c37f0059ee
2021-06-25 13:46:03 +01:00
Steven Ng 3ff0ee1a95 Fix rounded corners for shortcut & generated preview shadow box
Test: Open the widgets picker and locate shortcuts. Rounded corners are
      rendered on the rectangular box of a shortcut
Fix: 191948061
Change-Id: I24e4dc4c4a9c9c7e875444db5294f6c33f50db85
2021-06-24 21:17:13 +01:00
Alina Zaidi e92c63f45b Remove scrim from navigation bar from full widget picker.
Bug: 191926325
Test: Manually tested
Change-Id: Idc5fded9e8227a6aa9cf58c9e2cce146dc52a2c6
2021-06-24 20:20:05 +01:00
TreeHugger Robot 6604eb54bf Merge "Measure WidgetsBottomPicker again when the number of spans changes" into sc-dev 2021-06-24 18:43:32 +00:00
Steven Ng 53e8b46f66 Measure WidgetsBottomPicker again when the number of spans changes
Bug: In onMeasure, we calculate the number of spans that can be fit
horizontally. If the number of spans has changed, we re-organize
widgets shown in the table. However, after that, we didn't measure
WidgetsBottomPicker and its children again. As a result, the newly
added widget previews' dimensions are never measured.

Test: Long press clock app and then click widgets. Rotates the screen
      and observe widgets correctly shown.
Fix: 191644950
Change-Id: Iae94fba5b137807483e061d785b18d59defb013e
2021-06-24 18:16:05 +01:00
Steven Ng 0571a370d1 Use default spans as min spans if the min spans > default spans
This is to match the behavior described in
AppWidgetProviderInfo#minResizeWidth/Height documentation.

Test: run LauncherAppWidgetProviderInfoTest
Bug: 191223844
Change-Id: I37c0c8bf5e4588919e5b30fab6d2fde7236e114b
2021-06-23 17:11:05 +01:00
Cyrus Boadway 719be9a9e4 Merge "Suppress Splash Screen on widget reconfiguration activity start" into sc-dev 2021-06-22 12:30:23 +00:00
Cyrus Boadway 263a00c738 Suppress Splash Screen on widget reconfiguration activity start
When a widget configuration activity is started, it's started from
the launcher. Under some circumstances the launcher's splash screen
would be shown, rather than the splash screen corresponding to the
tapped app.

To avoid confusion, we suppress the splash screen for configuration
starts.

Bug: 190153065
Test: manual
Change-Id: Ib18851f1bb50b64bc5d47b8aa5931490c969b54b
2021-06-22 09:22:33 +00:00
Stevie Kideckel ded80076db Add spacing between items as decorations instead of margins
There are bugs in the accounting for the margins if we manipulate the
view directly, causing the wrong top to be reported and the view to be
shifted when we call scrollToPosition. Item decorations ensure that the
layout system for the recycler view always has the right details about
the spacing.

Fix: 191642682
Test: verified locally
Change-Id: Ie80563757079e885c8178883ab16e314d01c5b32
2021-06-21 15:11:33 +00:00
Stevie Kideckel e99f3c9666 Fix bug in equals implementation for search headers
Fix: 191626327
Test: verified locally
Change-Id: I8103059a2759a8533581ff86cb57b28913cf5731
2021-06-21 10:42:16 +00:00
Stevie Kideckel dd19a24769 Merge "Load widget preview images before adding the rows to the adapter" into sc-dev 2021-06-18 22:37:32 +00:00
Stevie Kideckel a093523299 Load widget preview images before adding the rows to the adapter
This allows for smooth animations as the items will have their full
height resolved

Bug: 190892517
Test: verified locally
Test: CachingWidgetPreviewLoaderTest
Change-Id: I86afc6951a4cc82ae45e63795791d259a3bb3cda
2021-06-18 19:18:29 +00:00
TreeHugger Robot 2af9d27116 Merge "Revert "Deduct padding from widget size only if padding has been inset"" into sc-dev 2021-06-18 11:11:20 +00:00
Steven Ng 54b5424548 Revert "Deduct padding from widget size only if padding has been inset"
This reverts commit 71cefb593f.

Reason for revert: The default padding is added by the framework not the launcher. We really need to subtract padding from the size.

Bug: 190498032
Change-Id: If7f164da34aec3d8e022ef2c752b72292cca0489
2021-06-18 09:37:44 +00:00
Steven Ng 058308098b Use relative bounds for app widget color extraction
Fix 2 bugs in this CL
1. Before this CL, getBoundsForViewInDragLayer returns absolute bounds
   for widgets. What we want is the bounds of a widget when it is
   visible in the drag layer. ViewGroupFocusHelper#viewToRect has
   taken PagedView into account. This makes it a prefect candidate to
   calculate relative bounds of a widget.
2. requestLayout at the end of endDrag is problematic due to the drop
   animation. If the drop animation is still in progress when onLayout
   is called, the bounds of the widget isn't final. Since the color of
   app widget right before is already the final color. We don't really
   need to update the color extraction.

Test: Set the wallpaper and clock widget according to the bug. Then,
      reboot the device. The clock widget color shown right after
      reboot is the expected color. Long pressing the widget doesn't
      cause a color change.
Fix: 191114337
Change-Id: I466c8102dba0e5b207b3768e0935472cbd523235
2021-06-17 23:25:57 +01:00