Commit Graph

750310 Commits

Author SHA1 Message Date
Makoto Onuki
170338ae25 Merge "Remove unused variable" into tm-dev am: 4b29570d8b am: 955f52b03b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002649

Change-Id: I9e3487b17d9cc9c62a5ae3f4a531f589a46b960f
2022-02-25 19:12:07 +00:00
Automerger Merge Worker
07a2cdb4e2 Merge "Merge "User Switcher: Add a border around add button." into tm-dev am: ff88c1d33e am: 177e46ff26" 2022-02-25 19:11:45 +00:00
Automerger Merge Worker
b74ce85d34 Merge "Merge "Remove an unused AppSearch-related target." into tm-dev am: 5e6e0cb50b" 2022-02-25 19:11:35 +00:00
Aaron Liu
86fa91dd5a Merge "User Switcher: Add a border around add button." into tm-dev am: ff88c1d33e am: 177e46ff26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16982140

Change-Id: I8c0a871955d6efec1a9d888f036f91d05bca156b
2022-02-25 19:11:21 +00:00
Alexander Dorokhine
0c16c8759b Merge "Remove an unused AppSearch-related target." into tm-dev am: 5e6e0cb50b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16999165

Change-Id: I8b5bba5354bc4d9cdefaf389fc08ff1fbc1685af
2022-02-25 19:11:00 +00:00
Alexander Dorokhine
3b4a1bc03d Merge "Remove an unused AppSearch-related target." into tm-dev am: 5e6e0cb50b am: 06fbbb0182
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16999165

Change-Id: Ie638f50d22dee8f51b4c356921e03c9a7d0da4bd
2022-02-25 19:10:47 +00:00
Automerger Merge Worker
f8d353a81a Merge "Merge "Clear BCB if space allocation failed" am: b667621f8b am: b83bb72fb7 am: 0bbc41378b am: 57ef6a2de3 am: 362ba57d1c" 2022-02-25 19:10:36 +00:00
Automerger Merge Worker
bbf8eba9f5 Merge "Merge "Synchronize onMultiSimConfigChanged with callback registrations." into tm-dev am: 5d6650dd22" 2022-02-25 19:10:15 +00:00
Treehugger Robot
2459101b70 Merge "Clear BCB if space allocation failed" am: b667621f8b am: b83bb72fb7 am: 0bbc41378b am: 57ef6a2de3 am: 362ba57d1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997490

Change-Id: I767b8421f00aea88d649d781c6e1c20de6347eca
2022-02-25 19:10:10 +00:00
Automerger Merge Worker
90ad680d17 Merge "Merge "Synchronize onMultiSimConfigChanged with callback registrations." into tm-dev am: 5d6650dd22 am: 023f665939" 2022-02-25 19:09:59 +00:00
Grace Jia
16ca8b0448 Merge "Synchronize onMultiSimConfigChanged with callback registrations." into tm-dev am: 5d6650dd22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16993888

Change-Id: If895a2adb56c2d142b2dd8591c583c53539401c0
2022-02-25 19:09:42 +00:00
Grace Jia
cf58ccbde1 Merge "Synchronize onMultiSimConfigChanged with callback registrations." into tm-dev am: 5d6650dd22 am: 023f665939
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16993888

Change-Id: I60c18e8d78b77509206d3e1a92faf33cd2d22838
2022-02-25 19:09:25 +00:00
Automerger Merge Worker
f776c95fb6 Merge "Merge "MidiService: Add GuardedBy Annotation to USB MIDI" into tm-dev am: 4684f7f9ad" 2022-02-25 19:09:20 +00:00
Robert Wu
bc9a344c78 Merge "MidiService: Add GuardedBy Annotation to USB MIDI" into tm-dev am: 4684f7f9ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943027

Change-Id: Id276693773d62a7df9194541311a738eb21aab1a
2022-02-25 19:08:54 +00:00
Robert Wu
26dcbc00cc Merge "MidiService: Add GuardedBy Annotation to USB MIDI" into tm-dev am: 4684f7f9ad am: c72ca3443a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943027

Change-Id: I3a8d6d8cde5a31b7a4c8bb295efd1cd3c5ea4c09
2022-02-25 19:08:48 +00:00
Automerger Merge Worker
575417f1e3 Merge changes from topic "am-6f2622ae9fc0464b8fdb1bc6d47c0366"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 5c4f73ec58 -s ours am: 009e56f32c -s ours am: 20cb3551d1 -s ours am: 83fbe6e5cb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 80d89efad1 -s ours am: 6d219bbeeb -s ours am: 6a54d2991a -s ours am: 0a44a68810 -s ours
2022-02-25 19:08:29 +00:00
TreeHugger Robot
0acdda635e Merge "Change tile height to 80dp" into tm-dev am: f67e35de4c am: a94f8baa33
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16991307

Change-Id: I22df5faaa5884dd273fa28e7e433c655968d5f62
2022-02-25 19:08:05 +00:00
TreeHugger Robot
401f657268 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 5c4f73ec58 -s ours am: 009e56f32c -s ours am: 20cb3551d1 -s ours am: 83fbe6e5cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e8fa1d36a4595e149af0776893ec34a7db0476f
2022-02-25 19:07:47 +00:00
Automerger Merge Worker
75b0fad64c Merge changes from topic "am-7f6ad4d8071343e983ed9209ddedac63"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 5c4f73ec58 -s ours am: 009e56f32c -s ours am: 20cb3551d1 -s ours am: 83fbe6e5cb -s ours am: 8a02835a98 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 80d89efad1 -s ours am: 6d219bbeeb -s ours am: 6a54d2991a -s ours am: 0a44a68810 -s ours am: 884b51c1d1 -s ours
2022-02-25 19:07:36 +00:00
Bill Yi
05f240f84f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 80d89efad1 -s ours am: 6d219bbeeb -s ours am: 6a54d2991a -s ours am: 0a44a68810 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2eba483e8a62bc6b5eaedbff7f826bd76785b3cf
2022-02-25 19:07:28 +00:00
TreeHugger Robot
415c755230 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 5c4f73ec58 -s ours am: 009e56f32c -s ours am: 20cb3551d1 -s ours am: 83fbe6e5cb -s ours am: 8a02835a98 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5bfbc938216bf31cc51236a99afb5fcb5b44237
2022-02-25 19:07:21 +00:00
Automerger Merge Worker
e5534f85fd Merge changes from topic "am-1c3279848a044baa9a28cc9234034665"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 45e7bc7aec -s ours am: d42234e897 -s ours am: 13520842c3 -s ours am: d21f01260b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96cc0364fe -s ours am: c96116bc39 -s ours am: ba6324d141 -s ours am: 7b836772e2 -s ours
2022-02-25 19:07:13 +00:00
Bill Yi
a41ca497e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 80d89efad1 -s ours am: 6d219bbeeb -s ours am: 6a54d2991a -s ours am: 0a44a68810 -s ours am: 884b51c1d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26fd8f57f2e44e644077680d3e751a2bfefcb66a
2022-02-25 19:07:05 +00:00
TreeHugger Robot
3af6be5a9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 45e7bc7aec -s ours am: d42234e897 -s ours am: 13520842c3 -s ours am: d21f01260b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia811a8ca8f01ca70885a60960e3a53ff2221ebf4
2022-02-25 19:06:48 +00:00
Bill Yi
a10e2c7fe2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35958b264b -s ours am: ecc32fb029 -s ours am: 67254fdad5 -s ours am: 7e8d90b9cc -s ours am: 26881a4601 -s ours am: 6b381f037f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9617f22f84facce6985eb5837e4cfb97c63e32f3
2022-02-25 19:06:42 +00:00
TreeHugger Robot
6954aeb7a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 45e7bc7aec -s ours am: d42234e897 -s ours am: 13520842c3 -s ours am: d21f01260b -s ours am: 9d925d7d12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e7219cfbc21f7c078eb6197bd7a98ecc1dc7a11
2022-02-25 19:06:21 +00:00
Bill Yi
0f21c5be29 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96cc0364fe -s ours am: c96116bc39 -s ours am: ba6324d141 -s ours am: 7b836772e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2778705ceab7e986b1d3c09c7c53d475ab79bb67
2022-02-25 19:06:17 +00:00
Bill Yi
2ed2745f80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96cc0364fe -s ours am: c96116bc39 -s ours am: ba6324d141 -s ours am: 7b836772e2 -s ours am: 393fb10c13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I925738368e1822d8750c9ecb9ca5dec88d40f488
2022-02-25 19:06:09 +00:00
Automerger Merge Worker
81525652b5 Merge "Merge "Get the focused window from WMS" into tm-dev am: 30373751da am: e5a6c8e4ad" 2022-02-25 19:05:50 +00:00
Automerger Merge Worker
2d59ff8005 Merge changes from topic "am-344a48c6c0274c4888965c2251c8fe22"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 8502dacfca -s ours am: d0cb324a9c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 3bd7533833 -s ours am: ad5b6acf21 -s ours
2022-02-25 19:05:38 +00:00
Shan Huang
b3e5d57720 Merge "Get the focused window from WMS" into tm-dev am: 30373751da am: e5a6c8e4ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988634

Change-Id: Iff50f15280b1714e1455ba9006c72f6d71199bea
2022-02-25 19:05:31 +00:00
Bill Yi
08e6607aa3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6369db7e0 -s ours am: 8aa629ee77 -s ours am: 878d47755d -s ours am: bf7b4cb5a6 -s ours am: ed1d1a3358 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72b50f40376d7434a21eb2fc5b5e5d8021b345e9
2022-02-25 19:05:02 +00:00
TreeHugger Robot
cbc876f2af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: abcbec2acd -s ours am: 74cbc4fd20 -s ours am: ea962756fe -s ours am: 0267ae2bbd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I623d373191b737cd925dda7a243980d518a7e4c7
2022-02-25 19:04:45 +00:00
Automerger Merge Worker
0e57a88a77 Merge changes from topic "am-76dacaf3e7bc4779b45fd7f9f813da36"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 8502dacfca -s ours am: d0cb324a9c -s ours am: 47f6248051 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 3bd7533833 -s ours am: ad5b6acf21 -s ours am: 20ee3928eb -s ours
2022-02-25 19:04:37 +00:00
TreeHugger Robot
2bd2d429ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 8502dacfca -s ours am: d0cb324a9c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad130e59348868f49ee5f0714fc226df21317b6f
2022-02-25 19:04:35 +00:00
TreeHugger Robot
2095ebb3ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 8502dacfca -s ours am: d0cb324a9c -s ours am: 47f6248051 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e7e9de280888a2eee36dd89a73eaf89a939295c
2022-02-25 19:04:18 +00:00
Bill Yi
a4e0aadbfa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 3bd7533833 -s ours am: ad5b6acf21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f87f90eaf0b3aa4e9dbc108a95283c7ea6d511d
2022-02-25 19:04:13 +00:00
Automerger Merge Worker
0c54e6ef86 Merge changes from topic "am-9be6c5f4a93840d0a1765b474578b38a"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 53c12d0ac9 -s ours am: 212e2d5687 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90759a397c -s ours am: 75ef7f359c -s ours
2022-02-25 19:04:02 +00:00
Bill Yi
1a0d3965b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a164b2648 -s ours am: 3bd7533833 -s ours am: ad5b6acf21 -s ours am: 20ee3928eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I152ac2a29aa2e8a0107451a909456d1a66ddc955
2022-02-25 19:03:58 +00:00
Bill Yi
c1e7244da7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35958b264b -s ours am: dba7235de6 -s ours am: 6c11a508dd -s ours am: cee39d546a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie349ab8f2bb1fc7ace623f75586a3146317b8e86
2022-02-25 19:03:28 +00:00
TreeHugger Robot
0781091e34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 53c12d0ac9 -s ours am: 212e2d5687 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe43c57fb5dc6a5f1d9ac2ee60cb7b28ea3bddd7
2022-02-25 19:03:19 +00:00
Bill Yi
77b0773ed2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90759a397c -s ours am: 75ef7f359c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f7178a1c6f9474637fef6ed46c54dc710dc30c1
2022-02-25 19:03:00 +00:00
TreeHugger Robot
54e317d53d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 53c12d0ac9 -s ours am: 212e2d5687 -s ours am: b670afeed0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38da1ae630696e2f586f412af6f87e8f000997e5
2022-02-25 19:02:57 +00:00
Bill Yi
7a8d83b3fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90759a397c -s ours am: 75ef7f359c -s ours am: b7e56721bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I53cdba783679be2bcae6e49369eb76134609eba2
2022-02-25 19:02:40 +00:00
Automerger Merge Worker
2ed3177121 Merge changes from topic "am-566d6ff6b93c4b6a964e0d6bedc96292"
* changes:
  Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff am: 154d402e2e
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours am: 3523790e56 -s ours
2022-02-25 19:02:25 +00:00
Automerger Merge Worker
8a7d902cf2 Merge changes from topic "am-712f677e217f4d428b70d08e23d554a5"
* changes:
  Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours
2022-02-25 19:02:21 +00:00
TreeHugger Robot
0376edc6b6 Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff am: 154d402e2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985361

Change-Id: Ic1fe4a2437e04a06960c04c5991ddcebdcc0c848
2022-02-25 19:01:59 +00:00
TreeHugger Robot
eb7f1508aa Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp am: 3079759c9a am: 8f6baf51ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16985361

Change-Id: If6845908200b2af70e6925ec5c7aa0a1dfca315a
2022-02-25 19:01:47 +00:00
Bill Yi
ea2c75ea6a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours am: 3523790e56 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ddc08b5893d4f2b0bbd6eda5fafc3499c71fcb6
2022-02-25 19:01:42 +00:00
Bill Yi
43ab86498a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6 am: cba75616c7 -s ours am: 7a8bb04766 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia56db4648a4abbcf6a3187db0b681043eaa6c3d3
2022-02-25 19:01:18 +00:00