Commit Graph

58436 Commits

Author SHA1 Message Date
Alex Chau a8b1b20f70 Merge "Refactor DeviceProfile tests based on dump() and use real device dimensions for tests." into tm-qpr-dev am: ceb2aaa9e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19356826

Change-Id: I8987fc4719ad84ee8b6928b170e084861ee50863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 18:23:45 +00:00
Alex Chau ceb2aaa9e4 Merge "Refactor DeviceProfile tests based on dump() and use real device dimensions for tests." into tm-qpr-dev 2022-08-01 18:06:59 +00:00
Pat Manning 5f74bfd76d Refactor DeviceProfile tests based on dump() and use real device dimensions for tests.
- Added roundPxValueFromFloat when converting dp/sp to px to deterministically round up values around .5

Fix: 240133465
Bug: 237542518
Test: DeviceProfileTest.kt
Change-Id: If4239f714487fe5bf2ef44274e2ce415bd75c86d
2022-08-01 17:54:43 +00:00
Automerger Merge Worker 8234fa9eaa Merge changes from topic "am-a8bd616d471949689504ebc9266e4940" into tm-qpr-dev-plus-aosp am: 913d635bd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I513cd49ddfe34e15141e19649c3fba191c9541b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:50:58 +00:00
TreeHugger Robot 40be9db8de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bc92776f2f -s ours am: 247158606c -s ours am: ae26e0efb1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: If314ddf91802d8c5a10fa84a42874a831856450b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:50:48 +00:00
TreeHugger Robot 68b920cf80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bc92776f2f -s ours am: 92e74fe2f8 -s ours am: 0cd73409fc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I9283f379cf695e6d2ba144581d0b1740f3c01e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:44:22 +00:00
Bill Yi e2df5ee02f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c99c99db15 -s ours am: 6986c11a2e -s ours am: 2113cc9bd8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: Ifa61525612a51685aa740009945625f4a6cf2f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:44:14 +00:00
Bill Yi 3571941269 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a404b51754 -s ours am: fae73dcd2b -s ours am: d34366bfb7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472826

Change-Id: I1bf6287052b8b62df899e503cc5fc81a9c256b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:44:04 +00:00
Automerger Merge Worker 913d635bd4 Merge changes from topic "am-a8bd616d471949689504ebc9266e4940" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bc92776f2f -s ours am: 247158606c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c99c99db15 -s ours am: 34e8ec3b9b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a404b51754 -s ours am: 44f091e360 -s ours
2022-08-01 17:21:24 +00:00
TreeHugger Robot ae26e0efb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bc92776f2f -s ours am: 247158606c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I6daf78241ebb2148f0736a450b8e7c1a95f49f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:20:24 +00:00
Bill Yi 4c8539ee51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c99c99db15 -s ours am: 34e8ec3b9b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: Iff8ede5a1b200ac8d636ff463826d874d6641b5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:20:16 +00:00
Bill Yi 0e5111afd7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a404b51754 -s ours am: 44f091e360 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472826

Change-Id: Idd0c34b2d18145d9fd61a43c3f1e2be491207e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:20:04 +00:00
TreeHugger Robot 0cd73409fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bc92776f2f -s ours am: 92e74fe2f8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I44cd2681b82089532d3baa5036d483b2c4c77fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:18:27 +00:00
Bill Yi 2113cc9bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c99c99db15 -s ours am: 6986c11a2e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I1600b716377c0b99a7dc2f2bb82f6f0ffd2634e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:18:19 +00:00
Bill Yi d34366bfb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a404b51754 -s ours am: fae73dcd2b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472826

Change-Id: Ied51d39462cc209c8c6064a592e1c52083f29224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:18:08 +00:00
TreeHugger Robot 247158606c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bc92776f2f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I67f55c4fd707a8a4e58fec5419c3962c15c37199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:56:30 +00:00
Bill Yi 34e8ec3b9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c99c99db15 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: Ia50453f7be5ae4603617b827f80a72e16275b819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:56:21 +00:00
Bill Yi 44f091e360 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a404b51754 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472826

Change-Id: Id5ea1be1e4d0e4808dc020da1b1acf48fc88b090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:56:11 +00:00
TreeHugger Robot 92e74fe2f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bc92776f2f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I6675b2aa08393f79285d25172c7ad140232f5978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:55:26 +00:00
Bill Yi 6986c11a2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c99c99db15 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472827

Change-Id: I62dd7ae94bd17a2b2de0e6c51bd071c95223366d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:55:15 +00:00
Bill Yi fae73dcd2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a404b51754 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19472826

Change-Id: I03abad8133be564e3a5957e65bbe6339b4c5203c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:55:08 +00:00
TreeHugger Robot bc92776f2f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-01 16:30:17 +00:00
Tony Wickham 6db9f2a46b Merge "Dump mExclusionRegion bounds" into tm-qpr-dev am: 6e59888a89 am: a6bbd643cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19458613

Change-Id: Idae0bac76b9525889c39a7e47f4b5fac829e7146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 16:02:38 +00:00
Tony Wickham a6bbd643cd Merge "Dump mExclusionRegion bounds" into tm-qpr-dev am: 6e59888a89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19458613

Change-Id: Id7f1e132d3b5cc90d6423677762dd5745e5f802c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 15:43:42 +00:00
Tony Wickham 6e59888a89 Merge "Dump mExclusionRegion bounds" into tm-qpr-dev 2022-08-01 15:26:35 +00:00
Android Build Coastguard Worker 4609004671 Snap for 8887382 from 4a98d8f919 to tm-qpr1-release
Change-Id: I68a1883bde8dbaf013991b6c785dd893d970025d
2022-07-30 01:24:59 +00:00
Bill Yi c99c99db15 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I163610ca567d312552aa19b5fe289a572fdd4a2e
2022-07-29 18:19:27 -07:00
Bill Yi a404b51754 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic549123ae6c96ee0193a1f6bea7a7759f4f04cf8
2022-07-29 18:18:35 -07:00
Tony Wickham 3e70b820f0 Dump mExclusionRegion bounds
Also fix the dump for mDeferredGestureRegion to more helpfully print the
bounds instead of the region (which just prints "SkRegion()").

Test: adb shell dumpsys activity service TouchInteractionService | grep
- i region
Bug: 240654796

Change-Id: Ibb14c51f92ec01d2635cee33da15bb6d0421683d
2022-07-29 16:37:11 -07:00
TreeHugger Robot dc9e869d98 Merge "Set overview progress on fling to 1 only if going to overview state." into tm-qpr-dev am: 4a98d8f919 am: 8409354878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19394242

Change-Id: I7ab7caa501618291726673750b0816aa419ade36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:23:09 +00:00
TreeHugger Robot 8409354878 Merge "Set overview progress on fling to 1 only if going to overview state." into tm-qpr-dev am: 4a98d8f919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19394242

Change-Id: I6097c3a59675f5c6883d975a5ff57152ae061b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:05:28 +00:00
TreeHugger Robot 4a98d8f919 Merge "Set overview progress on fling to 1 only if going to overview state." into tm-qpr-dev 2022-07-29 22:46:35 +00:00
TreeHugger Robot e4f4ed218c Merge "Fixing search behavior in Launcher3" into tm-qpr-dev am: 8157be497d am: 3e5b0dd39d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19451873

Change-Id: Id43e98acb1065c72da88b4f8913201888dcbc940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 21:02:01 +00:00
Sebastian Franco 6e1024e161 Account for span greater than 1 in getReorderRadius
Fix: 239963678
Test: Making sure the reorder preview is being drawn when moving a widget
Test: atest ReorderWidgets
Change-Id: Id32919821ac9177b3428261354d361c52b8f9e2d
2022-07-29 13:47:33 -07:00
TreeHugger Robot 3e5b0dd39d Merge "Fixing search behavior in Launcher3" into tm-qpr-dev am: 8157be497d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19451873

Change-Id: I26c2f858d9ff4fd7728eb4c0fede69626454d2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 20:17:05 +00:00
Schneider Victor-tulias 1dbffe0af7 Remove unused logs
Fixes: 240173459
Test: Started launcher
Change-Id: I853d9a50a0c34a7fdda87ea20d46a9f7ac7542e3
2022-07-29 13:06:24 -07:00
TreeHugger Robot 8157be497d Merge "Fixing search behavior in Launcher3" into tm-qpr-dev 2022-07-29 19:48:34 +00:00
Jeremy Sim c9919c90a4 Merge "Update animations for TM-QPR: OverviewSplitSelect > Home transition" into tm-qpr-dev am: b7a781b599 am: 67c895776d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19224802

Change-Id: I9e684eff49cea2edce34917c02413cc1cf688f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:39:47 +00:00
Jeremy Sim c8e159d4cc Merge "Update calculation method for Overview UI placement on tablets" into tm-qpr-dev am: fe5bccbf6f am: 1b468babdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19289801

Change-Id: Ic97e19a97a19a1a1379c929fd8e9f5e8d0f8f77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:38:59 +00:00
Jeremy Sim 67c895776d Merge "Update animations for TM-QPR: OverviewSplitSelect > Home transition" into tm-qpr-dev am: b7a781b599
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19224802

Change-Id: I88ccda0d93c8491d2f414220d046a9d561b198aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:20:36 +00:00
Jeremy Sim 1b468babdc Merge "Update calculation method for Overview UI placement on tablets" into tm-qpr-dev am: fe5bccbf6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19289801

Change-Id: Ifd96660ca65230f598986290d3c97eb92dbd0cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:20:20 +00:00
TreeHugger Robot 197508c120 Merge "Listen to DisplayController for ignoreAutoRotateSettings" into tm-qpr-dev am: f49287d627 am: 1ba7282333
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19429918

Change-Id: I664401712cbad5c3eb373827ae5f79dec65e6652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 19:06:39 +00:00
Jeremy Sim b7a781b599 Merge "Update animations for TM-QPR: OverviewSplitSelect > Home transition" into tm-qpr-dev 2022-07-29 18:57:00 +00:00
Jeremy Sim fe5bccbf6f Merge "Update calculation method for Overview UI placement on tablets" into tm-qpr-dev 2022-07-29 18:56:40 +00:00
TreeHugger Robot 1ba7282333 Merge "Listen to DisplayController for ignoreAutoRotateSettings" into tm-qpr-dev am: f49287d627
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19429918

Change-Id: I2ccb73183c63a51d8165e04b4b4348dff5d92ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 18:23:18 +00:00
Sebastián Franco 8a8e848e39 Merge "[Cherry pick merge conflict] Updating visibility of some members for easier extensibility" into tm-qpr-dev am: 33edba1006 am: be69a39b72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19450088

Change-Id: I2d9132ff3576a49122afc608436483d5f59b825f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 18:18:34 +00:00
TreeHugger Robot f49287d627 Merge "Listen to DisplayController for ignoreAutoRotateSettings" into tm-qpr-dev 2022-07-29 18:05:17 +00:00
Sebastián Franco be69a39b72 Merge "[Cherry pick merge conflict] Updating visibility of some members for easier extensibility" into tm-qpr-dev am: 33edba1006
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19450088

Change-Id: I422bf32fe9d452449d3f1bf022761e674df1cd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 17:48:13 +00:00
Sebastián Franco 33edba1006 Merge "[Cherry pick merge conflict] Updating visibility of some members for easier extensibility" into tm-qpr-dev 2022-07-29 17:23:46 +00:00
Jerry Chang 40ff08495b Integrate split pair cold launch transition with shell transition
Fix: 222163803
Test: enabled shell transition, cold launch a split pair from overview
      has proper transition.
Change-Id: Ia5398d24baa64bc98a04e839f6d1247c7c7aabeb
2022-07-29 16:53:02 +00:00