Jon Miranda
9eea1d5e9f
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours am: 6f3f8252c2 -s ours am: b67b56d76f -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: If0ba5d42fe646d8064e1b9c786ab76893ef376ee
2022-02-18 17:39:45 +00:00
Bill Yi
f1fb56fd9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: I9fae140c49c790cb2af8e55bf6022df95252d0e7
2022-02-18 17:39:38 +00:00
Presubmit Automerger Backend
2424ae99bf
[automerger skipped] [automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c am: 233f9fc731 -s ours am: ff5e621397 -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 b2670d2051 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I4f2ff38271843822316a94b56e22ece89006e60d
2022-02-18 17:37:40 +00:00
TreeHugger Robot
f28f0b1f3b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 129c510583 -s ours am: 85c63814dc -s ours am: da7a268e7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: Idfafdebb7151d8ca48c11ba7163c50f25c3fbffa
2022-02-18 17:26:33 +00:00
TreeHugger Robot
9d24a56e94
Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into sc-v2-dev-plus-aosp am: 780a5e3a11 am: 57cbc6d7b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I08461b8c70d04071c1e84d372f326b0b81f44fee
2022-02-18 17:26:27 +00:00
Bill Yi
f708cf5d4c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31 am: 90db95d8e7 -s ours am: e3b977fa95 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: Ib9e219ed7793d60e1352bdd176f4a3d26d14fe0f
2022-02-18 17:26:26 +00:00
Jon Miranda
1e8217110e
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours am: 6f3f8252c2 -s ours am: b67b56d76f -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: Ic9e5404a9479d8e05399d4fd7cb4d31d87e4d21e
2022-02-18 17:26:19 +00:00
Presubmit Automerger Backend
4adfd45fcb
[automerger skipped] [automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c am: 233f9fc731 -s ours am: ff5e621397 -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 b2670d2051 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: Id1f47f7845b0924f8f494ec0b0aefd54a7981f73
2022-02-18 17:25:22 +00:00
TreeHugger Robot
da7a268e7f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 129c510583 -s ours am: 85c63814dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: Id62e87a4b592445e91bc34dc45809db2cf5fe406
2022-02-18 17:13:21 +00:00
TreeHugger Robot
57cbc6d7b7
Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into sc-v2-dev-plus-aosp am: 780a5e3a11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: Ia72ce339f80959b445808305637bf20ffc2f5d7a
2022-02-18 17:13:14 +00:00
Bill Yi
e3b977fa95
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31 am: 90db95d8e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I9ad21ee59f43b1b16875ae8096c63b20c5729687
2022-02-18 17:13:13 +00:00
TreeHugger Robot
85c63814dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 129c510583 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I2c8e49c36f6ec332d33ba0b6938409406a35ae98
2022-02-18 17:12:47 +00:00
TreeHugger Robot
129c510583
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-02-18 17:07:55 +00:00
TreeHugger Robot
780a5e3a11
Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into sc-v2-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31
Import translations. DO NOT MERGE ANYWHERE
2022-02-18 17:07:55 +00:00
Jon Miranda
b67b56d76f
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours am: 6f3f8252c2 -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I4460c587ac75231760382617175f132635d2a9e7
2022-02-18 17:04:21 +00:00
Presubmit Automerger Backend
ff5e621397
[automerger skipped] [automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c am: 233f9fc731 -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 b2670d2051 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I100075fa063d26f87316be5b41b237283ad81ad1
2022-02-18 17:04:16 +00:00
Jon Miranda
6f3f8252c2
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I89f3df27c4571f78673b8ee89b848ae1051d312a
2022-02-18 17:01:29 +00:00
Jon Miranda
90cac2cd9b
Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev
2022-02-18 16:39:04 +00:00
Bill Yi
081d0d3a76
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I39d318c848dcc2eb0b21381ca66b7ca881010ad7
2022-02-18 09:25:49 +00:00
Bill Yi
19b85d2e13
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0431a67c8e70e5d13f42f32a23eb44f10849b164
2022-02-18 09:24:50 +00:00
Bill Yi
90db95d8e7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I954b8ac2dd7af307ac69b17f5d0d5750d5a362fc
2022-02-18 09:24:25 +00:00
Bill Yi
98fda41b31
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie685cf732f6d413b10232c12c0b2faea1469b723
2022-02-18 09:24:16 +00:00
Bill Yi
634ddc934f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1a4cc201486cc623554b6169e59f00e31f17542a
2022-02-18 09:23:37 +00:00
Bill Yi
01a2f4aa46
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0189c940d0 2p: c7e6123889
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: Id1062b5d843ccf4feaedf87148294fe8a51b3bc2
2022-02-18 09:23:27 +00:00
Bill Yi
c7e6123889
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c 2p: 0189c940d0
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I7a24f4624bee42955f148bd53ee59a8452ab9d52
2022-02-18 09:23:17 +00:00
Bill Yi
0189c940d0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I5a77b6833c9a88b6f4c637145a1ba8eb6cc2c9c4
2022-02-18 09:23:08 +00:00
Bill Yi
42320fef47
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I71673719797ca397b6a1ab9ece1f7ffb735c2521
2022-02-18 09:23:08 +00:00
Bill Yi
a2ba15674c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I90d6a4aacc6b554740d489cc7e7689b632c9a2eb
2022-02-18 09:22:58 +00:00
Vinit Nayak
84124f7902
Merge "Remove Taskbar and Taskbar EDU flags."
2022-02-18 04:04:06 +00:00
Android Build Coastguard Worker
e8d192e9f5
Snap for 8195043 from 49141ccf2e to tm-release
...
Change-Id: I05861d9f85e3d22d3582f4548a7083e85041ce37
2022-02-18 02:09:06 +00:00
Iris Yang
dffa58cb1f
Merge "Get display id from display instead of the display of root view"
2022-02-18 01:43:54 +00:00
Winson Chung
1c4016e5ea
Merge "Fix issue with two back buttons showing during SUW"
2022-02-18 00:33:56 +00:00
Android Build Coastguard Worker
6d532b6842
Snap for 8195019 from a75f2ce2d2 to sc-qpr3-release
...
Change-Id: Ia8f03c9af7f97dd87f5822925f3939bb5bf9eb4e
2022-02-18 00:08:56 +00:00
Winson Chung
30a26ce1ab
Merge "1b/ Replace removed shared lib calls with direct calls"
2022-02-17 23:20:30 +00:00
TreeHugger Robot
a58fd800de
Merge "Only keep classes from original shared lib for now"
2022-02-17 23:18:03 +00:00
vadimt
d76d05162b
Preparing to using "platform-test-rules" library from Launcher tests
...
I want to include some stuff (like android.platform.test.rule.CrashDetector) but I want to land just the dependency part and see if I get postsubmit build problems that sometimes appear in obscure AOSP targets.
Test: presubmit
Bug: 187761685
Change-Id: I334b9f1029edbe8621df940900f43d0c5059373e
2022-02-17 14:40:33 -08:00
TreeHugger Robot
49141ccf2e
Merge "Revert "Clear all DragView in onSaveInstanceState""
2022-02-17 20:45:46 +00:00
Tracy Zhou
a2215455da
Merge "Correct order of split action buttons"
2022-02-17 19:13:26 +00:00
Thales Lima
73087f4b2c
Merge "Stop using bottom inset in preview"
2022-02-17 15:28:09 +00:00
Thales Lima
83b345338b
Stop using bottom inset in preview
...
We are not using the bottom inset (navbar) in Launcher anymore, so we should not use it in preview as well.
Fixes 205284107
Test: manual
Change-Id: Iefd71b3cbe8e738c4559716af8c85015ba7c3c41
2022-02-17 13:35:41 +00:00
Tracy Zhou
0551313a9b
Correct order of split action buttons
...
Fixes: 219988163
Fixes: 217965089
Test: https://screenshot.googleplex.com/8LNMBeEQhMVnDSm
Change-Id: I760c0b8085069181d9a1cdc582ac7d58a08f4724
2022-02-17 00:14:50 -08:00
Iris Yang
6a06d8615f
Get display id from display instead of the display of root view
...
Since `getRootView()` will increase the execution time, use
`getDisplay()` instead.
Bug: 202825727
Test: manually
Change-Id: I22ef58cb39716433cd8e91200837ab49229ae3e1
2022-02-17 03:29:16 +00:00
Android Build Coastguard Worker
378c4afc23
Snap for 8191477 from daf801c69e to tm-release
...
Change-Id: I28df8037a7a3e033d23d98016268560100febd66
2022-02-17 02:09:19 +00:00
Vinit Nayak
ec4adc1d5a
Remove Taskbar and Taskbar EDU flags.
...
Bug: 219035565
Change-Id: I643b5d006b5759723418901ffeb463fa04a82cbc
2022-02-16 17:42:21 -08:00
Android Build Coastguard Worker
24a9252cab
Snap for 8191458 from 144b0504ad to sc-qpr3-release
...
Change-Id: I8e4f90cedc6e7d7c064ef3fadb1ad8151f2afa28
2022-02-17 00:08:51 +00:00
TreeHugger Robot
369ae1aaf4
Merge "Re-enable bulk icon loading"
2022-02-16 23:58:30 +00:00
Presubmit Automerger Backend
233f9fc731
[automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Bug: 207389002
Change-Id: I3815ebc0a26f61950d03b63a011dce9e42adb036
Merged-In: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
2022-02-16 23:23:54 +00:00
Jon Miranda
35d294387c
Init FloatingIconView properties before fetching drawable.
...
& Make sure properties are reset when recycled.
This fixes the bug that causes BubbleTextView drawable not to get set.
Bug: 207389002
Test: locally disable loading AdaptiveIcons, ensure BubbleTextView
drawable always gets drawn for closing animation
Change-Id: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
(cherry picked from commit b2670d2051 )
Merged-In: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
2022-02-16 23:23:44 +00:00
András Klöczl
a29eed894f
Merge "Fix two panel tapl test dragging issue"
2022-02-16 22:47:47 +00:00
Vinit Nayak
b374beda80
Merge "Add null check for null task in getItemInfo()" into sc-v2-dev am: a75f2ce2d2 am: 9475a6d6c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828919
Change-Id: I2c02aadb4d8cd6e7ede1579bd8e986d7de8685ab
2022-02-16 21:53:44 +00:00