Commit Graph

46668 Commits

Author SHA1 Message Date
TreeHugger Robot e5be21cf48 Merge "Restrict the area for the input to unsatsh the taskbar" into tm-dev am: df022bd4c9 am: 064cd357ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17016891

Change-Id: I46262c81b93d24f0a44e50c7dcd984d22b6bd25e
2022-03-09 19:46:03 +00:00
TreeHugger Robot 064cd357ba Merge "Restrict the area for the input to unsatsh the taskbar" into tm-dev am: df022bd4c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17016891

Change-Id: Icf79f043a286f31ae1062d4f60166d44932cc0d3
2022-03-09 19:18:26 +00:00
TreeHugger Robot bd20c78803 Merge "Restrict the area for the input to unsatsh the taskbar" into tm-dev am: df022bd4c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17016891

Change-Id: I31b51fc6b808819c18cfb362aaaf4edd98e83817
2022-03-09 19:18:22 +00:00
TreeHugger Robot df022bd4c9 Merge "Restrict the area for the input to unsatsh the taskbar" into tm-dev 2022-03-09 18:51:36 +00:00
Schneider Victor-tulias 149360b59f Merge "Fixing crashloop where LauncherActivityInfo can be null during icon query." into tm-dev am: 59534c7a24 am: 59ab0043be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17109867

Change-Id: I049b63d2c72c25e3406a461bbb7da00bc0e9fe5f
2022-03-09 18:34:01 +00:00
Schneider Victor-tulias 59ab0043be Merge "Fixing crashloop where LauncherActivityInfo can be null during icon query." into tm-dev am: 59534c7a24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17109867

Change-Id: Icf97ae1c9de028d9081198a1d7dc831c8b542fd8
2022-03-09 18:33:55 +00:00
Schneider Victor-tulias cb36451121 Merge "Fixing crashloop where LauncherActivityInfo can be null during icon query." into tm-dev am: 59534c7a24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17109867

Change-Id: I39b15b54d99aa3ac9c2015e071b580dd112d99c0
2022-03-09 18:33:15 +00:00
Sam Dubey 2cbc43c8b3 Merge "Revert "Extract out common adapter logic to support different Al..."" into tm-dev am: a57dc7d402 am: a728b72970
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17141723

Change-Id: I19675c4eef223f206df9b9a5fa0cdf3bcb5456cf
2022-03-09 18:32:53 +00:00
Schneider Victor-tulias 59534c7a24 Merge "Fixing crashloop where LauncherActivityInfo can be null during icon query." into tm-dev 2022-03-09 18:13:18 +00:00
Sam Dubey 523fc8afcf Merge "Revert "Extract out common adapter logic to support different Al..."" into tm-dev am: a57dc7d402
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17141723

Change-Id: Ifb7d6af1e3c61fbd85518043c3c6d57dacefb358
2022-03-09 18:00:34 +00:00
Sam Dubey a728b72970 Merge "Revert "Extract out common adapter logic to support different Al..."" into tm-dev am: a57dc7d402
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17141723

Change-Id: I70919c339613a6e4e124c8c8d891c928d56d57c4
2022-03-09 18:00:32 +00:00
Sam Dubey a57dc7d402 Merge "Revert "Extract out common adapter logic to support different Al..."" into tm-dev 2022-03-09 17:32:34 +00:00
Sam Dubey 4f1a232cca Revert "Extract out common adapter logic to support different Al..."
Revert "Fixing AdapterItem import"

Revert submission 17044827-tm-dev-216150568

Reason for revert: Broke builds
Bug: 223609269
Reverted Changes:
I53eba3c8c:Fixing AdapterItem import
I1068e75d0:Extract out common adapter logic to support differ...
I24d8e54e8:Fix AdapterItem imports

Change-Id: I931c666db7dcb2c8eef1894b56b59ed688218def
2022-03-09 17:25:15 +00:00
Abhilasha Chahal ed61c3800a Merge "Extract out common adapter logic to support different AllApps layouts" into tm-dev am: c19c0f9eab am: 20571b7164
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17044827

Change-Id: I606a6fb8edc832b234d5296f2819954967ac95ea
2022-03-09 17:04:39 +00:00
TreeHugger Robot fdad094a0b Merge "Shrink hotseat icons size in large tablet portrait" into tm-dev am: 22d263a080 am: 82f23689ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17136843

Change-Id: If2cf72238b71580c1c65e27c733b0276d83c91db
2022-03-09 17:04:16 +00:00
Abhilasha Chahal 20571b7164 Merge "Extract out common adapter logic to support different AllApps layouts" into tm-dev am: c19c0f9eab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17044827

Change-Id: I99dcde171532431936671eccdbb919ceb59fc7ed
2022-03-09 16:40:51 +00:00
Abhilasha Chahal 27ef4654b6 Merge "Extract out common adapter logic to support different AllApps layouts" into tm-dev am: c19c0f9eab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17044827

Change-Id: Ic14c2bc75f1c700d68adc6352f316535789218af
2022-03-09 16:40:48 +00:00
TreeHugger Robot 82f23689ff Merge "Shrink hotseat icons size in large tablet portrait" into tm-dev am: 22d263a080
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17136843

Change-Id: I0d14537f2b3521a445496daad3bec66d2fdb8f09
2022-03-09 16:40:20 +00:00
TreeHugger Robot 19a62ee714 Merge "Shrink hotseat icons size in large tablet portrait" into tm-dev am: 22d263a080
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17136843

Change-Id: I3832a887db6ceafb0ab599be91738df91bfbfddc
2022-03-09 16:40:12 +00:00
Abhilasha Chahal c19c0f9eab Merge "Extract out common adapter logic to support different AllApps layouts" into tm-dev 2022-03-09 16:25:00 +00:00
TreeHugger Robot 22d263a080 Merge "Shrink hotseat icons size in large tablet portrait" into tm-dev 2022-03-09 16:11:14 +00: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
Sam Dubey b763e0aa69 Merge "Revert "Sync hotseat/taskbar handoff"" into tm-dev am: 5c8ba15b1c am: a8eb22eee0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17129371

Change-Id: I704d4dd503f18035818118e5a21e82d0c4d121e8
2022-03-09 13:21:36 +00:00
Nick Chameyev a822736590 Merge "Do not run unfold taskbar animation when in portrait" into tm-dev am: 41b7f53805 am: a2a5004c9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17070204

Change-Id: I31be2f3b10ad5e5f955736a968253a671566d6f8
2022-03-09 12:41:37 +00:00
Sam Dubey a8eb22eee0 Merge "Revert "Sync hotseat/taskbar handoff"" into tm-dev am: 5c8ba15b1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17129371

Change-Id: Ib7eac876fc2f6267179f114f4f265fa2b4f3736e
2022-03-09 12:29:10 +00:00
Sam Dubey c7d4e2a2a2 Merge "Revert "Sync hotseat/taskbar handoff"" into tm-dev am: 5c8ba15b1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17129371

Change-Id: I9649b293f2e8cc3fac4d8029ee58500a6f02674b
2022-03-09 12:26:09 +00:00
Nick Chameyev a2a5004c9c Merge "Do not run unfold taskbar animation when in portrait" into tm-dev am: 41b7f53805
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17070204

Change-Id: Id8eff2b4ac6b4dcb8532670fe9efd93a27ab0089
2022-03-09 12:09:40 +00:00
Xin Li ce4baaeb9f [automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -s ours am: f29e0a220b -s ours am: 9551cc3f15 -s ours am: 88e8c4d16c -s ours am: b37454fce7 -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: Id15ab4ec0e3fff74762a84d5b755002c5b7dc992
2022-03-09 12:09:01 +00:00
Xin Li f2534c6f7a [automerger skipped] Merge Android 12L am: bac85d0348 -s ours am: 5f2987a89b -s ours am: bf72e8be47 -s ours am: e465497bcc -s ours am: dc62d4000d -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I3c59eebc3d0f1e6f049005bb3b95496ff4577fce
2022-03-09 12:06:18 +00:00
Nick Chameyev 70913b90ff Merge "Do not run unfold taskbar animation when in portrait" into tm-dev am: 41b7f53805
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17070204

Change-Id: Ib6ecd12fc5cc46f62d1659531d024ffcdf57c88c
2022-03-09 12:02:14 +00:00
Xin Li 2573313ccf [automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -s ours am: f29e0a220b -s ours am: 9551cc3f15 -s ours am: 88e8c4d16c -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I6207def3610f017c97e9008435b1df45fd08cb16
2022-03-09 11:39:08 +00:00
Xin Li b37454fce7 [automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -s ours am: f29e0a220b -s ours am: 9551cc3f15 -s ours am: 88e8c4d16c -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I67c354516707836cc30fc3788153adb628359492
2022-03-09 11:38:54 +00:00
Xin Li 5cf2635c29 [automerger skipped] Merge Android 12L am: bac85d0348 -s ours am: 5f2987a89b -s ours am: bf72e8be47 -s ours am: e465497bcc -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I8bf3b95e5cea753f54424625fdf715fa9e4bd343
2022-03-09 11:36:26 +00:00
Xin Li dc62d4000d [automerger skipped] Merge Android 12L am: bac85d0348 -s ours am: 5f2987a89b -s ours am: bf72e8be47 -s ours am: e465497bcc -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I397b776a395821d9fda851230b020563086566c2
2022-03-09 11:36:13 +00:00
Sam Dubey 5c8ba15b1c Merge "Revert "Sync hotseat/taskbar handoff"" into tm-dev 2022-03-09 10:58:03 +00:00
Nick Chameyev 41b7f53805 Merge "Do not run unfold taskbar animation when in portrait" into tm-dev 2022-03-09 10:26:21 +00:00
Xin Li 88e8c4d16c [automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -s ours am: f29e0a220b -s ours am: 9551cc3f15 -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I9c74d7ae6c2a70d2fa95c4372a33c5b5441b5e0c
2022-03-09 10:05:00 +00:00
Xin Li e465497bcc [automerger skipped] Merge Android 12L am: bac85d0348 -s ours am: 5f2987a89b -s ours am: bf72e8be47 -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

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

Change-Id: I3eee1b493d44ded4f1943cadac5c27240872a4ad
2022-03-09 10:02:16 +00:00
Sam Dubey 8d55819f6e Revert "Sync hotseat/taskbar handoff"
This reverts commit 4937d79c03.

Reason for revert: Breaking launcher tests on cf foldable and tablet targets
Bug: 223485229

Change-Id: I7a54982967426c4da9eb62ba100226102be6549e
2022-03-09 07:53:39 +00:00
Jeremy Sim 4362094b8e Merge "Fix UI overlap when rotating in split select mode" 2022-03-09 03:36:36 +00:00
TreeHugger Robot 59df9e8f27 Merge "Widgets - Filter work widgets when Work Profile is paused." into tm-dev am: a33117ddb3 am: b8fb3b8ed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17125528

Change-Id: I6a32865ef6ac0adb78f4b6976e38c2baf6a24a8a
2022-03-08 23:04:00 +00:00
TreeHugger Robot b8fb3b8ed0 Merge "Widgets - Filter work widgets when Work Profile is paused." into tm-dev am: a33117ddb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17125528

Change-Id: Ie4c519f2a79adf0849db3b1b541957a4963b398c
2022-03-08 22:38:51 +00:00
TreeHugger Robot 82cb3e4d68 Merge "Widgets - Filter work widgets when Work Profile is paused." into tm-dev am: a33117ddb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17125528

Change-Id: I8c7efc8188a6e4886f92e0d0971ed687e0f735b3
2022-03-08 22:38:47 +00:00
TreeHugger Robot a33117ddb3 Merge "Widgets - Filter work widgets when Work Profile is paused." into tm-dev 2022-03-08 22:09:11 +00:00
Xiang Wang 1a4bdb2d70 Merge "Move the BitmapUtil to com.android.internal package" into tm-dev am: f86e884582 am: 57092f5c18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16934327

Change-Id: Id975c5678545cd5dbe80030f26a033d833ba32e6
2022-03-08 20:49:53 +00:00
Xiang Wang 57092f5c18 Merge "Move the BitmapUtil to com.android.internal package" into tm-dev am: f86e884582
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16934327

Change-Id: I9d96bc86bceba02f3e50c973a7fdbb628fbaa37a
2022-03-08 20:21:59 +00:00
Xiang Wang 5de2a870cf Merge "Move the BitmapUtil to com.android.internal package" into tm-dev am: f86e884582
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16934327

Change-Id: I5909280b3247e7d7612ed5c0d88d3da69a584806
2022-03-08 20:21:50 +00:00
Xiang Wang f86e884582 Merge "Move the BitmapUtil to com.android.internal package" into tm-dev 2022-03-08 20:06:56 +00:00
Evan Rosky af9a7860ef Merge "Switch to persist.wm.debug" into tm-dev am: 324b07b44b am: eb5e4526b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058517

Change-Id: I196e0b83f56f86ec095f56d8723e037fd2f05506
2022-03-08 20:03:36 +00:00
Jon Miranda be6304282d Merge "Sync hotseat/taskbar handoff" into tm-dev am: a95837767b am: f2a763bbe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17111271

Change-Id: I580db1951f055928c529472618cf0021dac9debe
2022-03-08 19:46:07 +00:00