Commit Graph

60459 Commits

Author SHA1 Message Date
TreeHugger Robot 9d348aaf15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 836dbca092 -s ours am: 20c41f5918 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib13f37e8ed70f71969d9d7e48cc93be1dec0316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:26 +00:00
Bill Yi cc9142927d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a31959e9de -s ours am: 3ade2a70f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d805f2fff26a232cda2d3096a94f2591d58f026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:14 +00:00
TreeHugger Robot e5409a3d73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 451d752a1f -s ours am: db01fde93a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad255cfe6917a34053f4f88c2a57279e1a5cc9e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:47:35 +00:00
Bill Yi 75482fa774 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e76968615 -s ours am: 065e690f71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3041bcca6ee0436f7681e49755cf0d924e59197a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:47:27 +00:00
Bill Yi cb47717ca5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13797b3952 -s ours am: dc23da03e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c40e7689f3c068ba350b974efbafcdf86323471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:47:16 +00:00
TreeHugger Robot 20c41f5918 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 836dbca092 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia860320ae4e71f1c3362eb08f63279111d767e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:19 +00:00
Bill Yi 3ade2a70f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a31959e9de -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia06232c3ffd17e8ec8e41f5cea90100e6ce434f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:06 +00:00
TreeHugger Robot db01fde93a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 451d752a1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ddaa46fa6ebe2cf8f0f7aba40ef7acbb800d5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:14:59 +00:00
Bill Yi 065e690f71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e76968615 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I255dafbd4109a41f3296e236af7c7a3965622738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:14:53 +00:00
Bill Yi dc23da03e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13797b3952 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2997e519c5b74fd6cf325fe040d220e6a3c6a720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:14:41 +00:00
Treehugger Robot bf8a2429ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70689199c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I540ce3429cb4b1b86b8554a08677679c932b05e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:06 +00:00
Bill Yi 30e5748993 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e8ad70206 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b22c04a2936c1115fc95490f1673e42fe04cffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:00 +00:00
Treehugger Robot 0cd951ea1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd1fae4277 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I060b05118dabe323e379a0a62b8445ec2f110d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:53 +00:00
Bill Yi a1ba8d0b9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b81886af7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89cc026c8d8ebcf0e211054a04524c796ac194c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:38 +00:00
Treehugger Robot f82012ed90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8768464a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dd7923b187b2875761f4f1e62118dd722aa5212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:23 +00:00
Bill Yi cff899118a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2989bc50c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I612cc8e7e358b9eb2b81ac635a94d25e0e3597ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:12 +00:00
TreeHugger Robot 836dbca092 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:42:20 +00:00
TreeHugger Robot 451d752a1f Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-06-06 18:41:04 +00:00
Treehugger Robot 70689199c1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:29:34 +00:00
Treehugger Robot fd1fae4277 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:29:34 +00:00
Treehugger Robot d8768464a2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-06 18:29:34 +00:00
Vinit Nayak da9213791e Ensure null elements aren't added to TaskView shortcut list
Bug: 234874147
Change-Id: I5ed84fdc64128264e5808b7d3b019c47e3740469
2022-06-06 09:18:42 -07:00
Alex Chau b9afb71dc0 Revert "Increase PromiseIconUiTest timeout temporarily"
This reverts commit 6ecc69974b.

Temporarily revert back to DEFAULT_ACTIVITY_TIMEOUT to test if the issue is reproducible on lab devices

Bug: 222319304
Test: PromiseIconUiTest
Change-Id: I7188f6227ba06f654e08a1be1f59bb89899f4c2b
2022-06-06 14:55:27 +00:00
Jeff Chang 5ee83f3b5e Show split option without consider the "Lock task mode"
wm-core supports split-screen and lock-task mode work together now.
This CL enables the split-option to allow users to enjoy the
split-screen experience.

Bug: 199342537
Test: Options show up as expected
Change-Id: I38f58dec2985eaaabdbed1fdeeeece2d6e59945f
2022-06-06 14:47:47 +08:00
Bill Yi 8e8ad70206 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I55830e2459bc3d1c8eed84bcc96ab8f856b10530
2022-06-05 17:12:12 -07:00
Bill Yi 2b81886af7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6af2022983eea02c62b33fc4b1a0d39fe9911ec8
2022-06-05 17:11:27 -07:00
Bill Yi d2989bc50c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I39bbd2c49268c2f578398d45cec234a0fcdebc61
2022-06-05 17:10:55 -07:00
Bill Yi a31959e9de Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id0b1f8f1a27bdcb908b419275b41436d955a5280
2022-06-05 17:09:16 -07:00
Bill Yi 5e76968615 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5cf8d6d60a6eee17404ceb312cc68eaaca27e5c1
2022-06-05 17:08:31 -07:00
Bill Yi 13797b3952 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I44c9b7ba60e6908b2c044ae6a46fbcb794b2bde3
2022-06-05 17:07:58 -07:00
Android Build Coastguard Worker c874e65511 Snap for 8683631 from 863ebce70b to tm-qpr1-release
Change-Id: I7b3c9939531a3df6290f648afa6ccc23bf695ffe
2022-06-04 23:24:50 +00:00
Android Build Coastguard Worker 758e3f5e4d Snap for 8683593 from d4a79eb99b to tm-release
Change-Id: I51705b7178ff9fceeb37285cc5812c5caa7d199b
2022-06-04 21:24:26 +00:00
Automerger Merge Worker e42b1351d4 Merge "Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: fb5d602a99" into tm-d1-dev-plus-aosp am: 766f2a6191 am: d98bbfa253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: Ib6f526a37a44b2a17100d42b7ff23a6cec159eb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 06:17:32 +00:00
Hyunyoung Song 75b2c8702e Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: 28a73e2165 am: 6a31adc528 am: f915f3b02a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I4ce64996f4482fe72d213e015bbce460824f9323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 06:17:17 +00:00
Hyunyoung Song 21223a0dc6 Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: fb5d602a99 am: 863ebce70b am: 9aeda4d277
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I09a716f3d2fa76e488e5d56f45ce75da4b2beee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 06:17:02 +00:00
Automerger Merge Worker d98bbfa253 Merge "Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: fb5d602a99" into tm-d1-dev-plus-aosp am: 766f2a6191
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I3bad13cfcc6b78b5fe92037943695fcbaf3ee087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 06:01:03 +00:00
Hyunyoung Song f915f3b02a Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: 28a73e2165 am: 6a31adc528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I05a0e155a1924f33e4885ae9192e2d68abe0d881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 06:00:34 +00:00
Hyunyoung Song 9aeda4d277 Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: fb5d602a99 am: 863ebce70b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I201e5f147ce6233b937326631e6f88fff34feeff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 06:00:18 +00:00
Automerger Merge Worker 766f2a6191 Merge "Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: fb5d602a99" into tm-d1-dev-plus-aosp 2022-06-04 05:43:57 +00:00
Hyunyoung Song 562e3dea5c Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: fb5d602a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I477d3ba454e4660fb6579cb16eda94aea4c0e9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:43:46 +00:00
Hyunyoung Song 6a31adc528 Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: 28a73e2165
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I0960974b64f3bf6edbd753d6380c1c8012e50c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:43:45 +00:00
Hyunyoung Song 863ebce70b Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: fb5d602a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: If4d9e903a2911ccad62a91b7bed9942e22deb707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:43:43 +00:00
Hyunyoung Song f9d168f13e Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b am: e153da358c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: Id97cd2e9fac15799679560ed34a84d5d2c81aa2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:43:14 +00:00
Hyunyoung Song fb5d602a99 Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: Ic33ea1954a2dd50ab1427eccc39955c4154e1704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:28:07 +00:00
Hyunyoung Song e153da358c Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: I36f8b364ee330c683d27bdea2a57c430ee4ab0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:27:08 +00:00
Hyunyoung Song 28a73e2165 Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev am: d4a79eb99b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18725729

Change-Id: Iff8877d741abfe1c3d64dfd75023a4778426439c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:26:44 +00:00
Hyunyoung Song d4a79eb99b Merge "Fix IME hiding animation being delayed after unlocking the device" into tm-dev 2022-06-04 05:10:48 +00:00
Android Build Coastguard Worker d3b17dc9e5 Snap for 8680934 from dde2536a52 to tm-qpr1-release
Change-Id: I5152d74a1fc4967988265cf83a3119ce190ddf8c
2022-06-04 03:24:51 +00:00
Automerger Merge Worker 7cf49db77b Merge "Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c am: 774c53f919" into tm-d1-dev-plus-aosp am: a8294e25bc am: 489fcefdcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: Ic95c23012144875931d84ea3547d03d7648cdd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:34 +00:00
TreeHugger Robot 25b12ca9bf Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c6c am: 3ecc8654a6 am: f61c71f292 am: f256053aeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18521352

Change-Id: Ia2876e2c816b290844e83bc20440c73d5b409dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:26 +00:00