Commit Graph

61792 Commits

Author SHA1 Message Date
Bill Yi bb637e04f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:07 +00:00
Bill Yi 3ac2f2be14 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:07 +00:00
Colin Cross 5a7cfbdaf2 Fix more kotlin nullable errors in Launcher3
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4aef83aa32df00c3d3e7c4cc239a08299c3b7d7d)
Merged-In: I158db4f57d46606d7152a438d68e2b9f4c0014d9
Change-Id: I158db4f57d46606d7152a438d68e2b9f4c0014d9
2023-09-07 17:45:10 +00:00
Bill Yi 078333cede Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I004542644a2b2c5cb934d115f0fb64368513b541
2023-09-07 00:28:15 -07:00
Bill Yi fa35b203bb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I34e5c0bb9776353c0e56880dfd457b0c6d59035c
2023-09-07 00:27:31 -07:00
Xin Li 841dfad3d6 Merge UP1A.230905.019
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: I130465c5f31cededa1edc540123d83c6dedc9487
2023-08-31 12:31:10 -07:00
Treehugger Robot 2545c08fbb Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-08-31 16:34:39 +00:00
Treehugger Robot 0575764428 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-08-31 16:34:39 +00:00
Bill Yi 64d30e7420 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5db215391d4cf1712fe1e0e7b0ce0410e5ada397
2023-08-30 19:50:26 -07:00
Bill Yi d43d8d30db Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4f5ff43681d342c64bc0a5f3c940cbf15779d8fb
2023-08-30 19:49:58 -07:00
Bill Yi a9eccb406b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ice62b6654758a6fca02ded25ffc4501aa636a165
2023-08-30 19:49:35 -07:00
Xin Li 41dd5f48d6 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Ia7c5c2101a30d0eaae0fc92801186e66baec449d
Change-Id: Ic9654f2c43bbfb878e3f46eb39698b570fb8dd44
2023-08-17 12:13:35 -07:00
Android Build Coastguard Worker 3ce9069bed [coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L31700000962567991 into udc-release.
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: Ifc8c16ec3926b14d558692d830adbc78e5438d3d

Change-Id: Ic7c41a968828c0fbadfbfb3fe1546afcd24d38fd
2023-08-14 22:22:31 +00:00
Android Build Coastguard Worker 1148cdf500 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10656238-L31700000962567991.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: Ifc8c16ec3926b14d558692d830adbc78e5438d3d
2023-08-14 22:17:38 +00:00
Nick Chameyev 781fcebcc8 [Unfold animation] Do not preemptively start the animation if it has run already
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.

This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.

This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.

Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
  check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d)
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-14 22:15:12 +00:00
Android Build Coastguard Worker ab6183f8fd [coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L18400000962566963 into udc-release.
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: I0425d8869040ec5ff020c95a21f396bf60000e6d

Change-Id: I6ead99d1af434b63a905278905fa2940fb7e3fcc
2023-08-14 21:30:32 +00:00
Android Build Coastguard Worker 12245673d8 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10656238-L18400000962566963.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: I0425d8869040ec5ff020c95a21f396bf60000e6d
2023-08-14 21:25:32 +00:00
Nick Chameyev 5dfa2976bf [Unfold animation] Do not preemptively start the animation if it has run already
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.

This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.

This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.

Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
  check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d)
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-14 21:23:07 +00:00
Android Build Coastguard Worker a9e806be33 [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L16700000962543246 into udc-release.
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: I858cb023d2e533c56209e724e603d8a310931074

Change-Id: I5e41aebfd66b525d4ee67daa5e8c4ab4cc6886ac
2023-08-12 00:33:09 +00:00
Android Build Coastguard Worker 7252b77998 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10644925-L16700000962543246.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: I858cb023d2e533c56209e724e603d8a310931074
2023-08-12 00:28:18 +00:00
Nick Chameyev 0effcbca84 [Unfold animation] Do not preemptively start the animation if it has run already
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.

This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.

This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.

Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
  check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d)
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-12 00:26:39 +00:00
Android Build Coastguard Worker 57f15d7f80 [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L75300000962528215 into udc-release.
COASTGUARD_SKIP: If54a4f4d8ed5e882b38ab475b68f6e312c9423f1
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: I008d32f49cac005501b6c0e2e512d03a952156ac
2023-08-11 07:20:05 +00:00
Android Build Coastguard Worker 61f3140a20 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10644925-L75300000962528215.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: If54a4f4d8ed5e882b38ab475b68f6e312c9423f1
2023-08-11 07:16:14 +00:00
Nick Chameyev 413a2346cb [Unfold animation] Do not preemptively start the animation if it has run already
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.

This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.

This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.

Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
  check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d)
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-11 07:15:14 +00:00
Colin Cross 9f7fab352b Merge "Fix kotlin nullable errors in Launcher3" into main am: fc786807ad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2702133

Change-Id: Ia1f973cc7e67c3a51bf0ec80489df09f16f4cb73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 05:19:55 +00:00
Colin Cross fc786807ad Merge "Fix kotlin nullable errors in Launcher3" into main 2023-08-11 04:40:48 +00:00
Colin Cross 7b5878e03e Fix kotlin nullable errors in Launcher3
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I26edfec35dca14abe90b08e3c74de0446eda95d2
Merged-In: I26edfec35dca14abe90b08e3c74de0446eda95d2
2023-08-10 11:16:55 -07:00
Android Build Coastguard Worker 3f6994162f [coastguard skipped] Merge sparse cherrypicks from sparse-10615833-L02900000962494793 into udc-release.
COASTGUARD_SKIP: Ibd4d143838b7cafcfd85a40541295c3332b7be08
COASTGUARD_SKIP: Ib4e0c5d297311677bdedd0f05fb35d848359abc7

Change-Id: Ib309f0d869c53a73d5d4632c6f3de72259ef8a96
2023-08-10 02:10:30 +00:00
Android Build Coastguard Worker d7da38e470 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24377484'] into sparse-10615833-L02900000962494793.
SPARSE_CHANGE: Ibd4d143838b7cafcfd85a40541295c3332b7be08

Change-Id: Ib4e0c5d297311677bdedd0f05fb35d848359abc7
2023-08-10 02:05:53 +00:00
Neha Jain eb8fb49a96 Revert "Log appear animation's scale factor"
DO NOT SUBMIT
Revert submission 24154592-cherrypick-log-scale-factor-p3v8iq0onb

Reason for revert: b/294401542

Reverted changes: /q/submissionid:24154592-cherrypick-log-scale-factor-p3v8iq0onb
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:306ca475386d61367a0b557b8f415eb5bfce5cc9)
Merged-In: Ibd4d143838b7cafcfd85a40541295c3332b7be08
Change-Id: Ibd4d143838b7cafcfd85a40541295c3332b7be08
2023-08-10 02:05:18 +00:00
Android Build Coastguard Worker c386a52d48 [coastguard skipped] Merge sparse cherrypicks from sparse-10615697-L60900000962405601 into udc-release.
COASTGUARD_SKIP: I8eadeecea932cad65ff512b1dd944f1e2f0dcde4
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: I5ee9152089d621518d605a1380b39d3bee6cc2ab
2023-08-05 01:40:17 +00:00
Android Build Coastguard Worker 6f007458b5 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960', 'googleplex-android-review.googlesource.com/24154592'] into sparse-10615697-L60900000962405601.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b
SPARSE_CHANGE: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: I8eadeecea932cad65ff512b1dd944f1e2f0dcde4
2023-08-05 01:35:04 +00:00
Fengjiang Li 5038853cd7 Log appear animation's scale factor
Test: Grabbed a bug report b/291974797
Flag: N/A
Bug: 290320302
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2303acd7d4272b063352598d4ec65c5b92e0f0f7)
Merged-In: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf
Change-Id: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf
2023-08-05 01:33:46 +00:00
Nick Chameyev ed1503317c [Unfold animation] Do not preemptively start the animation if it has run already
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.

This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.

This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.

Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
  check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d)
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-05 01:33:38 +00:00
Android Build Coastguard Worker 12b87a800c [coastguard skipped] Merge sparse cherrypicks from sparse-10615697-L90400000962407107 into udc-release.
COASTGUARD_SKIP: I99fdaa2dd2a163c46ea9003394a626789ea6fbb4
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: Ie61b3e2cd90ce0fa306e3b2fec4b66ef5a11c1f4
2023-08-05 00:59:50 +00:00
Android Build Coastguard Worker 5b37731458 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960', 'googleplex-android-review.googlesource.com/24154592'] into sparse-10615697-L90400000962407107.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b
SPARSE_CHANGE: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf

Change-Id: I99fdaa2dd2a163c46ea9003394a626789ea6fbb4
2023-08-05 00:55:13 +00:00
Fengjiang Li 30471b4d6c Log appear animation's scale factor
Test: Grabbed a bug report b/291974797
Flag: N/A
Bug: 290320302
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2303acd7d4272b063352598d4ec65c5b92e0f0f7)
Merged-In: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf
Change-Id: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf
2023-08-05 00:53:36 +00:00
Nick Chameyev 8d1e9f08df [Unfold animation] Do not preemptively start the animation if it has run already
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.

This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.

This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.

Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
  check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d)
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-05 00:53:27 +00:00
Android Build Coastguard Worker 7a9fd85957 [coastguard skipped] Merge sparse cherrypicks from sparse-10609355-L16700000962392049 into udc-release.
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
COASTGUARD_SKIP: I787658a004873e5650cf885483528f867a00b7ab

Change-Id: Ia56018de842e6167a86d56ba0dbd5fedaf24d6a7
2023-08-04 02:12:56 +00:00
Android Build Coastguard Worker ca249f0a51 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10609355-L16700000962392049.
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b

Change-Id: I787658a004873e5650cf885483528f867a00b7ab
2023-08-04 02:07:02 +00:00
Nick Chameyev 8e263cb930 [Unfold animation] Do not preemptively start the animation if it has run already
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.

This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.

This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.

Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
  check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d)
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-04 02:05:36 +00:00
Android Build Coastguard Worker bff4a889c0 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24231346'] into udc-release.
Change-Id: I8da5ab27f2c02cdbfe0869778bd231ae60f07637
2023-08-01 01:09:58 +00:00
Sebastián Franco 628f74bd71 Disable FOLDABLE_SINGLE_PAGE
The functionality should go back to the same as with phones.
There shouldn't be issues with the reorder or similar behavior since we
are switching form using the MultipageCellLayout to the regular
CellLayout.

The things we need to pay attention to is the the behavior of having two
panels like adding the right number of panels when loading (folding, unfolding and rotating).

Bug: 291822492
Test: ReorderWidgets
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8d606e89d3511a6f65e3a80add97c0fae580fb97)
Merged-In: I903873e32f35c5ee9e0f3da8581a37d4087d021f
Change-Id: I903873e32f35c5ee9e0f3da8581a37d4087d021f
2023-08-01 01:09:35 +00:00
Android Build Coastguard Worker e55a79dab0 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24156953'] into udc-release.
Change-Id: I71b8f9eb54de40db3e5f2f7ced6c44d1d817e75d
2023-07-26 00:57:32 +00:00
randypfohl c59599dc19 Removing obsolete call to start home activity with shell transitions
- The second start activity was causing issues with 3p launchers which
  may not expect another new intent (ie. if it handles gestures at
  the bottom of the screen).  We can't completely remove this logic
  because for button navigation we don't want to fall through to the
  launch-next-task animation below, but we can can continue to
  finish the recents animation immediately.
- With shell transitions, leashes for opening apps are always hidden
  by default so when transitioning to a 3p launcher from
  RecentsActivity we also need to show the surface if we want to
  animate it in

Bug: 289609734
Test: Set 3p Launcher as default, in both gesture & button navigation
      - Go from 3p home -> overview, then overview -> 3p home
      - Go from app -> 3p home
      - Go from app -> overview, then overview -> 3p home
      - Quickswitch from app

Signed-off-by: Winson Chung <winsonc@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2b3dc6f73007f8b7d97ae2972e37c5d055659c8b)
Merged-In: I6875083931de63a8097d23d180553885ed7cfb01
Change-Id: I6875083931de63a8097d23d180553885ed7cfb01
2023-07-26 00:57:07 +00:00
Android Build Coastguard Worker a31ca81d53 [coastguard skipped] Merge sparse cherrypicks from sparse-10502572-L39700000962039696 into udc-release.
COASTGUARD_SKIP: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
COASTGUARD_SKIP: I38720247bf3f5ca08e59bcc570558e456c88c411

Change-Id: I40c5312a682bc2800e6cc6f5a6d2bcc3cf0eac16
2023-07-18 16:59:10 +00:00
Android Build Coastguard Worker 89d4949311 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f

Change-Id: I38720247bf3f5ca08e59bcc570558e456c88c411
2023-07-18 16:49:52 +00:00
fbaron 8a18bc0f12 Fix inability to remove or interact with folder when removing 2nd item from folder
Fix: 289960317
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon out of folder lets you open the app that remains where the folder was
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon into remove droptarget removes the folder and turns it into a single clickable icon
flag: no flag
(cherry picked from commit 5a7ea3069b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:326ec97ab6a4d348708830cd2860d4dd90a59039)
Merged-In: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
Change-Id: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
2023-07-18 16:49:12 +00:00
Android Build Coastguard Worker e126440f8b Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into udc-release.
Change-Id: Ibee4cd36f6f40b94108e3bfeec99afd25265f4cd
2023-07-18 04:35:53 +00:00
fbaron faf861aae5 Fix inability to remove or interact with folder when removing 2nd item from folder
Fix: 289960317
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon out of folder lets you open the app that remains where the folder was
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon into remove droptarget removes the folder and turns it into a single clickable icon
flag: no flag
(cherry picked from commit 5a7ea3069b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:326ec97ab6a4d348708830cd2860d4dd90a59039)
Merged-In: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
Change-Id: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
2023-07-18 04:32:08 +00:00