Commit Graph

757442 Commits

Author SHA1 Message Date
Jonathan Scott
9e446d561b Merge "Change version checks to use SdkLevel.isAtLeast*" into tm-dev 2022-04-14 18:00:11 +00:00
TreeHugger Robot
b88d3d4718 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a78e679bd5 -s ours am: 87d87b41de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I095cccbd994fcc7ee6653d91b3190c22c2a787cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:45:25 +00:00
Bill Yi
99fd5ed3c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75035b5960 -s ours am: 193e92379c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib01a6cc27054490efd01f598e01a397947d6eff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:45:04 +00:00
TreeHugger Robot
7cb917c94f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe67b54f3 -s ours am: 5246dd693b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d92ff6d0367c947a3cce8315521311ea588dc97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:44:32 +00:00
Bill Yi
87ba565965 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7cf4c0dee0 -s ours am: c705b87a21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9daa4f3d708d131d38ceb06d91c93db3fa1af41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:44:11 +00:00
TreeHugger Robot
fc262e6308 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2eebf46e04 -s ours am: c85837cb9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0af665da9c2ceb34a479203033c8b074309368fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:43:08 +00:00
TreeHugger Robot
87d87b41de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a78e679bd5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55e652e6329f39e812a3a9ff23bedcc8c079d5d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:40:42 +00:00
Bill Yi
193e92379c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75035b5960 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09611fdafdc12b1e6fa085eae82cddaa9d1acdde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:40:31 +00:00
TreeHugger Robot
5246dd693b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe67b54f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic5a6dd38791afb9851e06943234b9ea7d5f13d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:39:46 +00:00
Bill Yi
c705b87a21 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7cf4c0dee0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae248b99499e5aa076462759d643eaba18facbb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:39:37 +00:00
TreeHugger Robot
4c5c66d961 Merge changes from topic "presubmit-am-30d5e3b252a64882bd8232ecbecd0e04" into sc-v2-dev-plus-aosp am: f93e57c620
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17738482

Change-Id: I1b28a6b46df564146b3580decda4cbadf7eca7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:39:13 +00:00
Bill Yi
f72d223b73 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f58839f636 am: ea8c96050c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c431276b1acd47be773adacc98f59d507524a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:59 +00:00
TreeHugger Robot
c85837cb9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2eebf46e04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ab09f177776a8809d1e6c2aa80bdcdfe1048887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 17:38:39 +00:00
Aaron Liu
56e8e8e7d0 Merge "[Bouncer] Fix translation speed for notifications." into tm-dev 2022-04-14 17:37:22 +00:00
TreeHugger Robot
447af5dee2 Merge "By default, only eng builds allow latency-test broadcasts" into tm-dev 2022-04-14 17:30:13 +00:00
TreeHugger Robot
a78e679bd5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:12:26 +00:00
TreeHugger Robot
cab274dcef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:09:58 +00:00
TreeHugger Robot
df288534fb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:09:21 +00:00
TreeHugger Robot
addff7a70d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:09:15 +00:00
TreeHugger Robot
4fe67b54f3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:05:29 +00:00
TreeHugger Robot
f818f99f9b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:05:15 +00:00
TreeHugger Robot
f93e57c620 Merge changes from topic "presubmit-am-30d5e3b252a64882bd8232ecbecd0e04" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f58839f636
  Import translations. DO NOT MERGE ANYWHERE
2022-04-14 17:04:38 +00:00
TreeHugger Robot
2eebf46e04 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:04:38 +00:00
Winson Chiu
fbf8386dc7 Merge "Re-root and use device remount APIs for SystemPreparer" into tm-dev 2022-04-14 16:57:17 +00:00
Alex Stetson
1d0baf79bf Merge "Use KeyguardViewController for SystemUIDialogManager" into tm-dev 2022-04-14 16:30:38 +00:00
TreeHugger Robot
c0fc0ae2c7 Merge "Make READ_NEARBY_STREAMING_POLICY adoptable by shell for CTS tests" into tm-dev 2022-04-14 16:02:04 +00:00
John Wu
a46e2b911c Merge "Null check before accessing mRemovedInfo in PMS" into tm-dev 2022-04-14 15:59:19 +00:00
TreeHugger Robot
5dc3845396 Merge "Add metrics for low battery warning" into tm-dev 2022-04-14 15:48:55 +00:00
Nate Myren
b3ed7e93e1 Merge "Make AutoTileManager lisen for component enable/disable" into tm-dev 2022-04-14 15:44:50 +00:00
Bill Yi
5d1328ca15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 31773816e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I632457e35c84d8e2bb18ae06674d5d720795059c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:36:37 +00:00
Bill Yi
c6e89c7b3e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fd7e02e7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I406207748c0bb483dd9639ff070c3e6aa9e31342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:36:26 +00:00
Bill Yi
55d46bf7f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 558a3781e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I144ec8895faacc196ac9df4887080776d207ac58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:35:51 +00:00
Bill Yi
5fa83b4cff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23530b9084 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I477334f6c7aa7ca318796f76b56ea9c000a060fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:35:39 +00:00
Bill Yi
aae0f60638 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9dd6e17902 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I344e104275f12fee97b70e18f3accc4db963c95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:35:06 +00:00
Automerger Merge Worker
457668d2db Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 11205c0fa2 -s ours" into tm-dev 2022-04-14 15:34:39 +00:00
Bill Yi
276adeddbf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4b06a7e690 -s ours am: 54bd0b5d35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f0579301c003778b923394cb2420610dca1c524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:34:26 +00:00
Bill Yi
40e6dd2637 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 11205c0fa2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0b216faaa1b9eec66cc14f42c1aca44aa7d0bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:34:23 +00:00
Bill Yi
027cdaa5dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8055f832ca -s ours am: e4c8eff63c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I415a9a8b9c5242d65887436d38e5fa8c12d9770b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:34:11 +00:00
Bill Yi
fb99f0b6f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b681d7c20 -s ours am: 85af26ac68 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e4c89a47fe6523965c7ee65e8a1416dec3dfc13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:33:49 +00:00
Automerger Merge Worker
6397b1e3b5 Merge changes from topic "am-6edfa0d45b204ee2885798a044e33cd8" into tm-dev
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d0e22717e3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff24f43363 -s ours
2022-04-14 15:33:46 +00:00
Bill Yi
268f59340a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbafdfce8d -s ours am: 539a1a6c1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6acd6e82eb4b1924cd0544f4680df4507ee06ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:33:32 +00:00
Bill Yi
6b2627ff3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d0e22717e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifcf397a10b17c052c40e837eaf143745131193cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:33:25 +00:00
Bill Yi
990354e143 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff24f43363 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iedce5ce61b557759719cc131fb1e0e7feec9d6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:33:14 +00:00
Bill Yi
54bd0b5d35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4b06a7e690 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib12ae17720948783000b6d16f103e6b72d58ae0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:32:51 +00:00
Bill Yi
e4c8eff63c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8055f832ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c12945518fe6cac980b25273e47d303f8d2d5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:32:44 +00:00
Bill Yi
6427fd0943 Merge changes from topic "presubmit-am-6d026c0057d6491db92643d150b2f314" into sc-v2-dev-plus-aosp am: 9d9c759be0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17734713

Change-Id: I77bbcb0ee93802449f4645a451df02c8ab3d1fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:32:42 +00:00
Bill Yi
cba570877f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 758f1d490e am: 4a293844a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5ae6e6b4afa08529374395b000d060548294d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:32:26 +00:00
Bill Yi
85af26ac68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b681d7c20 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e1021385ef261f7fa1db7e90fe75fe08e0ea863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:32:04 +00:00
Bill Yi
539a1a6c1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bbafdfce8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79c75383442c68aaaa55e743cfbe5dbaaa4ae9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:31:43 +00:00
Bill Yi
31773816e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 15:14:56 +00:00