Commit Graph

766507 Commits

Author SHA1 Message Date
Bill Yi
1ae432011b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a01b23cb -s ours am: 13b0938fa0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18092576

Change-Id: Ie660c620505952ddf90364e5c859142924da2c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:25:15 +00:00
TreeHugger Robot
e87f3cb2cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d2b419eb8c -s ours am: 8dcfbc1fa6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090512

Change-Id: I24d1716a0a882e50b8c6d1432830b7e13335c11a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:24:59 +00:00
Bill Yi
f23edda0d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 280953de4c -s ours am: 785cbcf966 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090512

Change-Id: I51d998b05369749ae76ba9a3960c756cb332ca3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:24:45 +00:00
TreeHugger Robot
23f3803d17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e1400a551d -s ours am: ab2c186e9b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18102047

Change-Id: Ibce0e50cecb27c892f29d973d721387660a07048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:21:23 +00:00
Bill Yi
3b9ee21c37 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a9bf8b5da -s ours am: 88d6f1736c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18102047

Change-Id: Ia5180a2d43fcfc232d30f9b5893eb3c9b0e22f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:21:00 +00:00
TreeHugger Robot
bfd86b0923 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 032e2d290a -s ours am: 9c88f5990c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108485

Change-Id: I0b3bc79bef136272040e972991ea8075ed8ab369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:18:22 +00:00
Bill Yi
fafe61c6bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7df6d795a -s ours am: eb6276c2f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108485

Change-Id: I4cd40186407264d9c56247a04e48ee26812b7b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:18:01 +00:00
TreeHugger Robot
2548ab37de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4292379fd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18107600

Change-Id: I6cab02dcb1bc9d9a4fb7cd351fb58d7bfb972491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:16:58 +00:00
Bill Yi
35e9ebf059 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: abb253af35 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18107600

Change-Id: Ib0b06ea6788a7eda05d47e6f880c4d411a9e548b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:16:29 +00:00
TreeHugger Robot
28f86d0a27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5db71e454e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18102025

Change-Id: I6174749a83a6ba939a4579acdc101ddd03671a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:14:42 +00:00
Bill Yi
1593110be7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c155e0be4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18102025

Change-Id: I25ad223daffae6263896ad4d642f74b0e79a7edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:14:40 +00:00
TreeHugger Robot
43dd619dbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 41f0cd6eeb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18101643

Change-Id: I1296503f7878de841bb47193cdf0ec3e4d1ce7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:14:27 +00:00
Bill Yi
6a4f6c6e1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb2dcb1298 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18101643

Change-Id: Ibec0d38b88cd7cc79cac85e6966a4fc343c78e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:14:25 +00:00
TreeHugger Robot
1524b4a4dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ad98a4f502 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18101353

Change-Id: I5dc939e5a4a5922584cccca40a2914f9a42a29c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:14:19 +00:00
Bill Yi
5d4f7f1a38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b456e0dca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18101353

Change-Id: I862f74cef523b48b8b0e9f9fb30202b8a0e60a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:14:10 +00:00
TreeHugger Robot
e6447f1766 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8badcdf1b3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18099959

Change-Id: I65698e0ee35ba914bc5aff1f1d9351bcb24e0b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:13:39 +00:00
Bill Yi
d8d0c3deaa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 21f3f4a369 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18099959

Change-Id: I327dbc896c0a67fceca3f09d1c064f1019d6da7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:13:23 +00:00
TreeHugger Robot
2fed97ee2f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b73990fb79 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097150

Change-Id: Ie4b6ec71236a06da32213ea6059f22f552967d29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:07:14 +00:00
Bill Yi
65846afb65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d486b8751e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097150

Change-Id: Ieafae3d7fa5a667abd7c3a284a2b87c151d16831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:56 +00:00
TreeHugger Robot
a293218d29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33fecd63b6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18093830

Change-Id: I81b3cf3a42f7bfecdb6662b87edb832015b7eb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:54 +00:00
Bill Yi
0ed515a10d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbf80adef3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18093830

Change-Id: Ifb2d4772f796fc4c16e1db698272f7ad6b621161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:51 +00:00
TreeHugger Robot
4de11f2a9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f2ef5952f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18092575

Change-Id: I68f9b3a09e3ee36e0d8b3e38c9ae11deedbc7d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:49 +00:00
Bill Yi
cf1aeb19ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ea365f19 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18092575

Change-Id: I5eb8b48baa729a75daf6a9c8686f437e4148510d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:47 +00:00
TreeHugger Robot
ef53d16e63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 941d24a584 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18092550

Change-Id: Ia69c19b42f825b42d22cfd5af42ad35ce2338e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:45 +00:00
Bill Yi
671f245271 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3859d72b6c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18092550

Change-Id: I2bf5537ff057d7c2aace277d29396125de034f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:30 +00:00
TreeHugger Robot
0d9f8db3c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 018f7a5aac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090730

Change-Id: Ib5f42a867cd2b4c0fb2b762765ac6211b3740a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:28 +00:00
Bill Yi
48982c83ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8301d79805 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090730

Change-Id: I05bf7619b1a4cd51be36a98c055b609b8ff64931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:06:10 +00:00
TreeHugger Robot
4b3b81b98b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b16fa64cc8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090056

Change-Id: If5313d45be3f1a8a530135c90e57b2ca0ef4a861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:05:51 +00:00
Bill Yi
ff02214f84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d5c68623c6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090056

Change-Id: I2150de90fe9612ddb5d6a8bb4905ad12d2abe4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:05:34 +00:00
Hyundo Moon
5f6d297335 Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" am: 0bec859fb5 am: 9558970e9d am: 72de105145 am: 178ca25806
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2086903

Change-Id: I5d4370340f8a98b6553052afbd73137c836e7875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:02:34 +00:00
Vinit Nayak
60ea5e82b3 Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c3553a am: 1cb3bafe5f am: c59bba906d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944716

Change-Id: Icdc1c6cc8a158b036ad1a72a8d05ba83912676f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:56:41 +00:00
Matt Casey
8ab8e50a6a Merge "Style tweaks for resolver empty state." into tm-dev am: e46c50811b am: ef16aea550 am: 0abeb3a99f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140742

Change-Id: I5108dc72ff08b28f9ea322ba7db476ae130c8066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:55:37 +00:00
TreeHugger Robot
12e673226a Merge "Remove the usage of device_config flag: DisplayManagerService.KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS." into tm-dev am: 0927574f3f am: e02e8396f6 am: cb7bfe8696
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943723

Change-Id: Iad3d5d3069832abfcd17eabce9f38bb68eb0446a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:55:19 +00:00
Austin Borger
193eb24ec8 Merge "CameraServiceProxy: Create utility method for detecting if the camera is disabled by device policy." into tm-dev am: e48afc4089 am: 2422ae8437 am: f4d319a0fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17967939

Change-Id: Ifd6ce59d0715ce7ee92f9b320bf5bd92897dfd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:48:04 +00:00
TreeHugger Robot
1bbeba508d Merge "Add logging to NPVC" into tm-dev am: 9750b0ca46 am: a72482fa22 am: 6256ffbd7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17958675

Change-Id: I9fddf6b7f536e6447aa9902b4e7222f63c2797f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:47:48 +00:00
Justin Weir
7ce3ffe9aa Added MediaData.active to the media carousel comparator am: 2e58b46209 am: 791e8b6094 am: debe9393eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090379

Change-Id: I5d0dba2d5e7737dd2ed03897b01d4d48d53d4d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:47:37 +00:00
TreeHugger Robot
52dc0ae546 Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf73739 am: 775b8e222c am: 74a2671cf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125637

Change-Id: I01662e482259d701f4a4cf553b008db57aa29549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:47:29 +00:00
Mateusz Cicheński
001680d13d Merge "Add a description to the params of keep clear rects APIs." into tm-dev am: f829b1332f am: 6c19b582f1 am: e969bf7d7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17772404

Change-Id: I2504f912d0682ae3ee02f557e0e55c9445c9e47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:47:15 +00:00
TreeHugger Robot
7004516214 Merge "[AppsFilter] separate classes for read and write" into tm-dev am: 4c71401de5 am: 0539d49aa9 am: d4e8f73d24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17921589

Change-Id: I7f77671f03f0c64f1969d7113d8f5c39982896a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:47:03 +00:00
Peiyong Lin
5e2ad6f958 Merge "Remove NavigationBarOverlayController." into tm-dev am: e26bcbb811 am: 687738c362 am: 3d14fd386f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083703

Change-Id: Idecdcd5af2e583f1f3d7f849ce45c6f357fd40dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:46:49 +00:00
Miranda Kephart
58ca8a2b83 Merge "Add clipboard source to edit image intent" into tm-dev am: 0c44208351 am: d7cf4c909a am: f15f6f6cbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144196

Change-Id: I6a5e5fc150a34747f388d85fea2e1f87dcd9b0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:46:35 +00:00
Pavel Grafov
fe52a9f8de Merge changes from topics "presubmit-am-18cfee8fd4a246488709515ab35ce4dd", "presubmit-am-909842e21190489984382774e830cfd7" into tm-dev am: 9f4d4e7352 am: 20381a032b am: 5209043caf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730694

Change-Id: Ie97a8fa29fb213f13aca1f045dde6edbb6fb43eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:46:25 +00:00
Jackal Guo
cbce4bf55a [automerger skipped] Merge "Revert "Escape single quotes in aapt2"" into tm-dev am: d63cdb916d am: d16011d658 am: f1439835cf -s ours
am skip reason: Merged-In I775b8a304e76a83934c36886c17cf23560914d21 with SHA-1 49956a73c1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134683

Change-Id: I5e8eed0f4f5c727e407e3a9b5060c7e8a9d8409b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:46:12 +00:00
Thomas Stuart
8845a57fac Merge "fix log spewing coming from Telecom#LogUtils" into tm-dev am: 424c6c1f13 am: fe7ddf3caf am: ef703aed4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18056443

Change-Id: Ibe46c59ae6fc547739a812738cff802d8c961c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:45:51 +00:00
Matt Pietal
e0689cb891 Merge "[DO NOT MERGE] Bouncer - Update selected item text color" into tm-dev am: f37b7bf3fa am: 6df528f078 am: 2ed12e6f26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030422

Change-Id: If4d3b3f75d678b9b4f247ec338c5d1595de3a13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:45:36 +00:00
Matt Pietal
278be35c59 [DO NOT MERGE] Bouncer - Update selected item text color am: 195baa1c93 am: 06db04703a am: 695cbeff0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030422

Change-Id: I0138de032bec6d6ef35e885e20f445e5d5d5e8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:45:33 +00:00
Vadim Caen
8ab8879406 Merge "Add developer option for back animation DO NOT MERGE" into tm-dev am: 064b49a1a1 am: 3a6daba948 am: a92a047ea3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I33375bb408b1b4a4b2f108975141741cc511ec66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:44:46 +00:00
Vadim Caen
1a0c60483c Add developer option for back animation DO NOT MERGE am: 94f506aa2a am: d67d675344 am: d6518e5a53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619727

Change-Id: I046226caae3ad0bff374d261211b94132c8247ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:44:39 +00:00
Vadim Caen
aa90344566 Merge "Update deprecation documentation for onBackPressed" into tm-dev am: 4f77430976 am: adb7c4631e am: 25f03fe925
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090442

Change-Id: Iabdd5f150c2e59e5dd2078db76676f79e409cbb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:44:02 +00:00
Chris Li
750ebd3464 Merge "Don't launch placeholder for bottom TaskFragment when waiting for top" into tm-dev am: d4011e0e2b am: 38dbe45b22 am: c924a21b10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983784

Change-Id: Iaa15d009b286ea6eee2d4a82d3c412e6e6104885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:43:50 +00:00