Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,646 Commits 3 Branches 0 Tags
dc6baeb264edfffa0cbf2b1cc96b451e25287ba2
Commit Graph

766646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joanne Chung
dc6baeb264 Merge "Use autofill specific dialog background" into tm-dev am: 7aee7c8232 am: 6cfe6e2751 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570246

Change-Id: Idb4e40669ec0093d76f363c3a8d1b2986d3f0a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 15:21:54 +00:00
Joanne Chung
6cfe6e2751 Merge "Use autofill specific dialog background" into tm-dev am: 7aee7c8232 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570246

Change-Id: I4b3c8030cff1de017f28f4b76fb321e31e16d779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 14:48:12 +00:00
Joanne Chung
7aee7c8232 Merge "Use autofill specific dialog background" into tm-dev 2022-05-24 14:23:41 +00:00
Matt Pietal
1736839a69 Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0f6 am: 04c8307b4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565167

Change-Id: I1fed977891faaa0622a95dcad860f0b4827326b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 14:22:43 +00:00
Matt Pietal
04c8307b4b Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565167

Change-Id: I53a35ece2fca66f4a4db8233359a48f02e454bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 14:03:09 +00:00
Matt Pietal
468ccad0f6 Merge "[LockScreen] Update bar state in NPVC." into tm-dev 2022-05-24 13:41:26 +00:00
TreeHugger Robot
f50591c036 Merge "Do not resolve activity creation if it is in unknown TaskFragment" into tm-dev am: 327887fad9 am: ef17f29be0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482930

Change-Id: I15badec21bb7a60ead9d8099510996bb5ef8f658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 11:55:30 +00:00
TreeHugger Robot
a8dacea460 Merge "Sync insets leash position with shell seamless rotation" into tm-qpr-dev 2022-05-24 11:50:14 +00:00
TreeHugger Robot
ef17f29be0 Merge "Do not resolve activity creation if it is in unknown TaskFragment" into tm-dev am: 327887fad9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482930

Change-Id: I436652364f0c17bfe98ad83806895833da16b80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 11:29:24 +00:00
Siim Sammul
6c9d90027d Merge "Add rate limiting to addTombstoneToDropbox." into tm-dev am: 0644bcb7a4 am: d88f79f222 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090284

Change-Id: I6c851768f48240036249af34722455f8489a97e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 11:20:56 +00:00
TreeHugger Robot
327887fad9 Merge "Do not resolve activity creation if it is in unknown TaskFragment" into tm-dev 2022-05-24 11:16:12 +00:00
Siim Sammul
d88f79f222 Merge "Add rate limiting to addTombstoneToDropbox." into tm-dev am: 0644bcb7a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090284

Change-Id: I8440b639e1a5dfc61ca446916508d7c4b3ef5b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 10:55:00 +00:00
TreeHugger Robot
140c506020 Merge "Consider sourceRecord when launching with adjacent flag" into tm-qpr-dev 2022-05-24 10:39:45 +00:00
Siim Sammul
0644bcb7a4 Merge "Add rate limiting to addTombstoneToDropbox." into tm-dev 2022-05-24 09:47:53 +00:00
TreeHugger Robot
e462cf394a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4ea9abf4c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib41935db31387dde504484faeff699f0a96f9069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:48 +00:00
Bill Yi
8bfe8e56c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69bd7f8fa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic76b556da732962c700e0523285a7eb6892a9aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:46 +00:00
TreeHugger Robot
0e0b2e3e9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 97f516b6cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I101d23027867a26b4ad68b70ee17926262dd113c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:44 +00:00
Bill Yi
1ad8162923 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 281cc6d4d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90008a765c5efa71d8ba904a1934d02c09674522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:42 +00:00
TreeHugger Robot
7ddc607bec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ab6e0bd3bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f1e74cf78a56683f2dcedf0137b37e927f395f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:40 +00:00
Bill Yi
c92672c71b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b737ccb648 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fd82530b98064ffee6d4112f4446767812ad185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:37 +00:00
TreeHugger Robot
c57fa04e2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d0d5dfa03a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6a8d77c2a4c83e42866f98b351c7a45cba827a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:30 +00:00
Bill Yi
241ad529d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d8b665025 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d04d4242fce3516fd65ce70c0e0a42c4d4fdd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:21:05 +00:00
TreeHugger Robot
2d70ed29bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1eb8eb6ca9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2373b9fbf0b7bf8630bc4e511f9485000743f711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:20:41 +00:00
Bill Yi
72f0bcd3c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b847f7865 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49e58f218e788ac7eacd03b22e1e32c558258120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:20:21 +00:00
Suprabh Shukla
cc130eb890 Merge "Add a metrics reason code for USE_EXACT_ALARM" into tm-dev am: 7fc26f8e53 am: 80bcc90afe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18485759

Change-Id: If4ef70b423b0ed6dc2330c6f6bab1f77b6c5682e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:15:28 +00:00
Louis Chang
604dc8cff6 Merge "Return the activity type of any child activity in the Task" into tm-dev am: 2b8d1c3548 am: d965aa4123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18527308

Change-Id: Ieccd552ab91f1d9dec8ae02ad071af9fc6d878f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 08:15:13 +00:00
TreeHugger Robot
4ea9abf4c8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-24 08:07:03 +00:00
TreeHugger Robot
97f516b6cd Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-24 08:07:03 +00:00
TreeHugger Robot
ab6e0bd3bf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-24 08:07:03 +00:00
TreeHugger Robot
d0d5dfa03a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-24 08:07:03 +00:00
TreeHugger Robot
1eb8eb6ca9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-24 08:07:03 +00:00
Jeff Chang
e9c7b90a38 Consider sourceRecord when launching with adjacent flag 
We should consider the sourceRecord if launching with adjacent flag,
otherwise the other split is empty. This CL ignores the flag if
there is no sourceRecord present during the launching.

Bug: 224881987
Test: atest ActivityStarterTests
Change-Id: I1f4c788538e6cfeb4fa6286423ddc049dd6c6389
 2022-05-24 15:54:44 +08:00
Suprabh Shukla
80bcc90afe Merge "Add a metrics reason code for USE_EXACT_ALARM" into tm-dev am: 7fc26f8e53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18485759

Change-Id: Ia747a1b80f8e8b23203baa997bb41a9407c5208a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 07:46:25 +00:00
Louis Chang
d965aa4123 Merge "Return the activity type of any child activity in the Task" into tm-dev am: 2b8d1c3548 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18527308

Change-Id: I27d53223682799a2e1d67bceb57d17e8114099d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 07:46:04 +00:00
Suprabh Shukla
7fc26f8e53 Merge "Add a metrics reason code for USE_EXACT_ALARM" into tm-dev 2022-05-24 07:43:55 +00:00
Louis Chang
2b8d1c3548 Merge "Return the activity type of any child activity in the Task" into tm-dev 2022-05-24 07:28:06 +00:00
Gabriel Huff
8115df8192 Merge "Revert "Revert "Re-add PackageVerifierTest to presubmit""" into tm-dev am: 9e53750628 am: 8437930504 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488316

Change-Id: I704fb5e7eaa2911adebba83225e9ce771fc7cbb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 06:32:14 +00:00
Gabriel Huff
8437930504 Merge "Revert "Revert "Re-add PackageVerifierTest to presubmit""" into tm-dev am: 9e53750628 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488316

Change-Id: Ibacb6f256fe5e3c0aae4685721c8b22b5568b5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 06:02:22 +00:00
Gabriel Huff
9e53750628 Merge "Revert "Revert "Re-add PackageVerifierTest to presubmit""" into tm-dev 2022-05-24 05:34:10 +00:00
Wu Ahan
a7b143046b Merge "Fix broken cuj instrumentation of CUJ_LOCKSCREEN_PIN_DISAPPEAR" into tm-dev am: e6ec124ee8 am: 7afa492cf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18527309

Change-Id: I84cd14d3b0b13d0c69e705547fe39548f5223168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 05:14:06 +00:00
Wu Ahan
7afa492cf1 Merge "Fix broken cuj instrumentation of CUJ_LOCKSCREEN_PIN_DISAPPEAR" into tm-dev am: e6ec124ee8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18527309

Change-Id: I5151ccd6885cd4388b433eeefb48a0b93ead4210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 04:43:26 +00:00
Shawn Lin
7c604236cc Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" into tm-dev am: 15cb562bcd am: 02c07a76ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18485561

Change-Id: Ifab44e33ac17ab673954019236b74f1fe4bfa4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 04:11:22 +00:00
Wu Ahan
e6ec124ee8 Merge "Fix broken cuj instrumentation of CUJ_LOCKSCREEN_PIN_DISAPPEAR" into tm-dev 2022-05-24 03:53:36 +00:00
Joanne Chung
df6e9d0d70 Use autofill specific dialog background 
Autofill bottomsheet dialog would like to use the material 3
design. So we change the background color but the file is used
by other modules, we should not change it. So we create a seprate
background for autofill dialog background.

Bug: 233657077
Test: manual.
Change-Id: I9968c864ae9de78faab4dc8e6427c960c36584d6
 2022-05-24 11:08:52 +08:00
Shawn Lin
02c07a76ba Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" into tm-dev am: 15cb562bcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18485561

Change-Id: Ic3858acd6fa4b2f686a124685d977bb3bc1b06e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 02:50:03 +00:00
Songchun Fan
78622ed1f6 Merge "[pm] skip sending PACKAGE_CHANGED broadcast if package has been deleted" into tm-dev am: c45a6dd61c am: d9733b9f3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18528673

Change-Id: I280320220a76dd7fe05c378c8e8f65c4b53b24d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 02:35:04 +00:00
Shawn Lin
15cb562bcd Merge "Replace DisplayManager.getStableDisplaySize with max Display.Mode" into tm-dev 2022-05-24 02:30:28 +00:00
Songchun Fan
d9733b9f3f Merge "[pm] skip sending PACKAGE_CHANGED broadcast if package has been deleted" into tm-dev am: c45a6dd61c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18528673

Change-Id: I008cdfbcd26667d0cff58e60b180e64d484b7394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 02:14:28 +00:00
Chris Li
9d4244ee6f Do not resolve activity creation if it is in unknown TaskFragment 
This can happen in two cases:
1. The activity is embedded in another app. Then the current organizer
   shouldn't control it.
2. The activity is in a TaskFragment that the organizer just request to
   remove, but hasn't reach the server side. Then the activity will soon
   be finished with the TaskFragment.

In either case, the organizer shouldn't need to resolve it. Otherwise it
may incorrectly change the state, such as entering split for a finishing
activity.

Bug: 233295443
Test: atest WMJetpackUnitTests:SplitControllerTest
Change-Id: I5d2028dd45abd8d20a8e82bc4e51c4d6dc6e26ee
 2022-05-24 10:05:14 +08:00
Songchun Fan
c45a6dd61c Merge "[pm] skip sending PACKAGE_CHANGED broadcast if package has been deleted" into tm-dev 2022-05-24 01:53:22 +00:00