Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
789,922 Commits 3 Branches 0 Tags
24a824156fe4e5f7350da198643fa2cfedcd2eda
Commit Graph

789922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
950fb419e7 Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev 
* changes:
  [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
  Stop crashing the system on hitting the alarm limit
 2022-07-20 01:17:36 +00:00
Ming-Shin Lu
7a593c23ae Remove hideCurrentInputMethod from RecentsAnimationController 
Since CL[1] migrate hide IME logic when quick switching split-screen
task to InputMonitor.

As a result, remove unused API since it would be no longer to
expose hideCurrentInputMethod for launcher to handle gesture.

[1]: Ibfcd48e623336c4690b71c4db0ce1ad8f5b26fc9

Bug: 166736352
Bug: 193990612

Test: manual test as steps
1) launch any apps with focusing an editor
2) from overview, select any app to enter split-screen mode
3) taping the editor to show the keyboard
4) swipe up to overview or quick switch app tasks
5) expect the keyboard will be hidden when starting the gesture.

Change-Id: I299c3ac8531fa28c68c997e44fb168819e85d465
 2022-07-20 00:15:53 +00:00
Steve Elliott
28dc43e6a7 Fix stale NSSL "fling" state caused by no-op fling 
If a fling gesture ends with the current Y position in the exact end
position for the fling, then the code to run the fling animation is
bypassed, but the flag in AmbientState tracking whether a fling is
active is never reset. This CL replaces the short circuit logic with the
standard fling-end logic, ensuring that all expected code paths are
executed.

Fixes: 234824085
Fixes: 237272856
Test: manual
  1. Enter lockscreen
  2. Swipe up and then down to the exact same position, in one
     continuous gesture
  3. Wait for a notification update
  Observe: Shade resizes correctly to match the new contents
Change-Id: Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415
Merged-In: Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415
(cherry picked from commit 7f387f9ae9)
 2022-07-20 00:07:20 +00:00
Xusong Wang
9fb5ad2a60 Change OWNERS. 
Test: n/a
Change-Id: If647d9f16ab26aab2a6cb7d699031a5db8cd6015
 2022-07-19 23:52:35 +00:00
Rucha Katakwar
a5bd39561a Update torch brightness max level description. 
Bug: 239492786
Change-Id: I01720f2d25b932d58fa8b7816f8504101d70f3a3
 2022-07-19 16:50:25 -07:00
TreeHugger Robot
3a0283f38b [automerger skipped] Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 0f0fbcad8a am: c326217c51 -s ours 
am skip reason: Merged-In I017b4e83a6af61c7827c9135176953809b139bb7 with SHA-1 70f5d083ce is already in history

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

Change-Id: Ibe5a30b798f779ba42a90986d752c6cf6dc03676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:37:37 +00:00
Automerger Merge Worker
4a8eedf8d8 Merge "[automerger skipped] Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 0f0fbcad8a -s ours am: 04cd2c1204 -s ours" into tm-qpr-dev-plus-aosp 2022-07-19 23:31:03 +00:00
TreeHugger Robot
83495a066a [automerger skipped] Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 0f0fbcad8a -s ours am: 04cd2c1204 -s ours 
am skip reason: Merged-In I017b4e83a6af61c7827c9135176953809b139bb7 with SHA-1 70f5d083ce is already in history

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

Change-Id: I8a50ee0530dec31d390ef4baa11a58ffee6272c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:30:49 +00:00
TreeHugger Robot
797d6720c0 [automerger skipped] Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 0f0fbcad8a -s ours am: 04cd2c1204 -s ours 
am skip reason: Merged-In I017b4e83a6af61c7827c9135176953809b139bb7 with SHA-1 70f5d083ce is already in history

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

Change-Id: Ia253628fd8ce8448e7cf490b3a78ae936dafe0d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:30:33 +00:00
TreeHugger Robot
ae636989f6 Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 51bfee0d8a am: 59634aaf0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I3c64a6d49db1ec39f4b5075b75048f2277e4204e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:30:09 +00:00
Caren Chang
8bd8e3ee20 Merge "Add explanation about the purpose of accessibility heading and use case apps should consider." am: 407d531735 am: afc1b7d01e am: 08ae6de00f am: 389bce3764 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2151635

Change-Id: Ife6f292b0350a51409ed45d075a379890ada7b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:29:33 +00:00
TreeHugger Robot
c326217c51 Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 0f0fbcad8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I47c1c8a7404061b61b69a6e98049db90c3963aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:14:24 +00:00
TreeHugger Robot
04cd2c1204 [automerger skipped] Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 0f0fbcad8a -s ours 
am skip reason: Merged-In I017b4e83a6af61c7827c9135176953809b139bb7 with SHA-1 70f5d083ce is already in history

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

Change-Id: If7913b96309c5d246e0e1b85e1ded2dce74ee7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:13:57 +00:00
Bill Yi
1ad4272417 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iacab418921a01c183e545801f7ecb4110d1a7ecb
 2022-07-19 16:12:12 -07:00
TreeHugger Robot
59634aaf0e Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b am: 51bfee0d8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I5ab01a6ba9574444e3c4946af7a78083af911ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:04:40 +00:00
Caren Chang
389bce3764 Merge "Add explanation about the purpose of accessibility heading and use case apps should consider." am: 407d531735 am: afc1b7d01e am: 08ae6de00f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2151635

Change-Id: Ifdbf4fa138e4a03580aea6a77b3c91c664d9b7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 23:04:22 +00:00
Bill Yi
c513a6b205 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5b0ba0235d319df52c9c4438988f1d68e7f5cdcd
 2022-07-19 16:03:49 -07:00
TreeHugger Robot
0f0fbcad8a Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I0ae814253b0093a255914cdf4d2d6c2abe3b3acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:55:43 +00:00
Jeff DeCew
a3dc352f37 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into tm-qpr-dev am: 7d3188b7c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19324468

Change-Id: Ie80b338627fc303182e28a8416e7036b3244e726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:54:23 +00:00
TreeHugger Robot
51bfee0d8a Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev am: 58dc8eb63b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069

Change-Id: I929a409ec111c6b08ca9395764007ba81ef0bf69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:54:16 +00:00
Andrew Chant
c693aa18dc Re-land "Limit the number of concurrently snoozed notifications" am: 19032530b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347838

Change-Id: I5be9b3fb9f92771ec58081a909027c0917e87795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:53:50 +00:00
Grace Cheng
2628ce5b3a Adding counter logging instances of multiple BiometricLogger ALS subscriptions 
Adds static counter logging a stack trace when ALS subscription counter
is non-zero after unsubscribing for debugging purposes. Also fixes a typo in
UdfpsController.

Bug: 233656407
Test: Observe logcat
Change-Id: I9362b119876bb0205fb23555250b8fbc234119fa
 2022-07-19 22:53:41 +00:00
Jeff DeCew
7d3188b7c3 Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into tm-qpr-dev 2022-07-19 22:53:41 +00:00
Julia Reynolds
509c00572e [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours am: 5e04d9cc2b -s ours am: acf1ba3035 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b7788110d4cffe25b854cc0961e1a103cba858d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:48:57 +00:00
Julia Reynolds
86b538c155 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours am: e6e1bdb816 -s ours am: 1e3d0785e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3b2989ec886604ff7a85b27532ee64a5df8eee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:48:47 +00:00
Julia Reynolds
60737eb80d [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours am: bcf7b77e13 -s ours am: a3e2e8d2f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7504ac056bf8da0b721748e2b9860584df6cf6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:48:24 +00:00
Julia Reynolds
6c98df2daa [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours am: a57f05206b -s ours am: c8879dbb62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I690b7ac7db7164149a2ea7a42b87cdb94ca2d6fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:47:20 +00:00
Caren Chang
08ae6de00f Merge "Add explanation about the purpose of accessibility heading and use case apps should consider." am: 407d531735 am: afc1b7d01e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2151635

Change-Id: Iad448b5b77a40c0ecfc6370ba391d2635ce66162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:47:07 +00:00
Julia Reynolds
6d0cd7d026 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours am: bcf7b77e13 -s ours am: 4f247bdefe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib96fd214d7e75d633672da02bc3ab3bfa5405a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:46:10 +00:00
Julia Reynolds
ca7aa266f8 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours am: a57f05206b -s ours am: 9861e1558c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica0ab049054ed3a991855f97bd8785453fbdad2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:45:34 +00:00
Andrew Chant
19032530b4 Re-land "Limit the number of concurrently snoozed notifications" 
Re-land "Limit the number of concurrently snoozed notifications"
in tm-qpr-dev to fixup automerger issues.

Bug: 239578926
Change-Id: If4b43ec6a2fb722235fa662bd7414283fe11baf2
 2022-07-19 15:41:08 -07:00
TreeHugger Robot
58dc8eb63b Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev 2022-07-19 22:39:42 +00:00
Bill Yi
7c2144fee4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifea3e8766543cf32bd83515e3a61a43ef638c0bd
 2022-07-19 15:34:13 -07:00
Caren Chang
afc1b7d01e Merge "Add explanation about the purpose of accessibility heading and use case apps should consider." am: 407d531735 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2151635

Change-Id: If08ab9af3186e37a8e59863ac701d3679e18bd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:29:08 +00:00
Julia Reynolds
acf1ba3035 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours am: 5e04d9cc2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ed4b9188c2df6811204a5c5fad8b04df0f21ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:23:48 +00:00
Julia Reynolds
1e3d0785e0 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours am: e6e1bdb816 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia17d65a3bd791c669bfd66d852f7e1f0c7852559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:23:08 +00:00
Julia Reynolds
a3e2e8d2f1 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours am: bcf7b77e13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e37f9bda35733f9e4f54590fffca20b584c547f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:22:27 +00:00
Julia Reynolds
4f247bdefe [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours am: bcf7b77e13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23cd8d9685e2f52f5d1595ea3cb7634eb7e8e941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:22:12 +00:00
Julia Reynolds
9861e1558c [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours am: a57f05206b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7af6042990f8a2d3f3d9c9f924dec5aa9b64a496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:21:59 +00:00
Julia Reynolds
c8879dbb62 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours am: a57f05206b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8dc6da71addb1bff57b3c4dcb22a086fbceb58eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:21:56 +00:00
Aaron Liu
e776d8f88b [Home Controls] Update home controls file usage. 
Update home controls to use UserFileManager to make home controls
compatible with multiple users.

Test: Manual and unit test
Bug: 227776912
Change-Id: I9d84850acd4c3b781e8b3325d9fd228bc98d4c12
Merged-In: I9d84850acd4c3b781e8b3325d9fd228bc98d4c12
 2022-07-19 22:05:33 +00:00
Caren Chang
407d531735 Merge "Add explanation about the purpose of accessibility heading and use case apps should consider." 2022-07-19 22:05:32 +00:00
Julia Reynolds
bcf7b77e13 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc35bcb4991c7754b78062af16e26b22f2f13b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:04:30 +00:00
Julia Reynolds
a57f05206b [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bfa25e2871973f8e5738206e1e56bbc165ed195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:04:24 +00:00
Andrew Chant
2b7fa77043 Merge "Revert "Remove unused net-module-utils-srcs filegroup."" am: 1ae7d6245c am: 4dde1ee814 am: 76443bd35d am: d4470c4ece 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2159641

Change-Id: I248e93d52a2eb47b4bf0f31f9c021088fba391bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:04:10 +00:00
Bill Yi
f69eafe5b1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3ea8f9b1434a560a6ca10e1494de58a23f7ab4db
 2022-07-19 15:03:45 -07:00
Julia Reynolds
5e04d9cc2b [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9ab123495cbbf608e3e97cdca9d689bde738915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:03:29 +00:00
Julia Reynolds
e6e1bdb816 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4b7e2354ee57dc7db01d7fb35e9a66d44eea59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:02:51 +00:00
Julia Reynolds
e1205e536a [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf65c84182fee357dd9006132b730ac2f9076317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 22:02:50 +00:00
TreeHugger Robot
6e8a097111 Merge "Revert "Revert "Crop windowing layer to that of display size in screen rotation animation""" into tm-qpr-dev am: 8426faea4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19327199

Change-Id: Ic07dd19997c9fbd0325acf1b667b847b45f1f047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:53:50 +00:00