Bill Yi
|
a165e66eb7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f -s ours am: eb1157c0d2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: I14a661b55940cb1c8f4429844eb788a6c489d578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:59:16 +00:00 |
|
TreeHugger Robot
|
0a0640ec02
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours am: 24c843fb30 -s ours am: 3648275e0e -s ours am: a8e2e5d101 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I7181ab2d8755321155588e68f93699aded99d05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:56 +00:00 |
|
Bill Yi
|
99d795343c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours am: 07b4ad75b4 -s ours am: 69803e4b8f -s ours am: 341f7a1185 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I0da93fe998bd045c1f075d7a196fade36401a6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:53 +00:00 |
|
TreeHugger Robot
|
a26f034312
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours am: 95d0cc1766 -s ours am: 6ac3ac9e63 -s ours am: 14389d1638 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: Ib123de5e001dd71af61e33d4d4a6087d95b2c246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:50 +00:00 |
|
Bill Yi
|
e879b9efc7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours am: 881db50b16 -s ours am: 88743c60d1 -s ours am: cddf29a7dc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I4d042c297a5ab3d12357ff67f2be04fdcc8c45e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:00 +00:00 |
|
TreeHugger Robot
|
57e7405202
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours am: cb5e97de8a -s ours am: e32f2d2b85 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I657d495a13638fe8c42626b1c3f89639533c67e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:28:05 +00:00 |
|
Brian Lee
|
e2c73af337
|
Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3 am: e07b26752f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915
Change-Id: I2910ffccc0b536ee9ff1bef2b9d6a3c64b09f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:52 +00:00 |
|
TreeHugger Robot
|
f33564a49a
|
Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475 am: 7d260c1654
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I24c4753ccfd0e6f9c0d499c90008be3524a4a03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:07 +00:00 |
|
Bill Yi
|
ce46a7afcb
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652 am: 5bdc27be54 -s ours am: 0d1cc8a7f0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I4fef0e9bc0a633711724688353095b108c155a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:04 +00:00 |
|
Henri Chataing
|
d0c9430840
|
[automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours am: 2b70be5485 -s ours
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: Ibf3adbb12f445c63e71690459b19c249fbd33453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:50 +00:00 |
|
Jack Yu
|
83bf646000
|
[automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours am: 8b0fa20c98 -s ours am: 7f070778cb -s ours
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: I8505f379ca9517a9132bef3d0724847ca2830d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:47 +00:00 |
|
Jack Yu
|
7f2acfb735
|
[automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours am: 3c0d7c9bfb -s ours am: 6aa379657d -s ours
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: I4d0279279fcebce29a75cdb509911e7dfc8146dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:45 +00:00 |
|
Jack Yu
|
6f2a3f7508
|
[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours am: bac3cfcbfe -s ours am: 0800590570 -s ours
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: I71da2527a732bb5197d1938438987fdd1b973367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:25 +00:00 |
|
Automerger Merge Worker
|
ad3f96436c
|
Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev am: 3e158cd48b am: 1b93660219
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642
Change-Id: Ic33944b232ccb2bccb3b4d05744dbebc06813478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:13:44 +00:00 |
|
TreeHugger Robot
|
7cef104bab
|
Merge changes from topic "tc_change_23022120_23" into udc-dev am: 1e410e7a11 am: 34a75bf63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269
Change-Id: I762dddfb6584c2c783949e0b5219274b274064c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:52:02 +00:00 |
|
Bill Yi
|
0d2ba5c0f1
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a am: 2f3719e7f8 -s ours am: 2ab0d2d710 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269
Change-Id: Idce13dde5ef0c7932237b42319239476d0eb6da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:51:53 +00:00 |
|
Bill Yi
|
eb1157c0d2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: Idd9697c51844e65517ebf743b126dd0a4cd26234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:33:18 +00:00 |
|
TreeHugger Robot
|
4f884ca030
|
Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693
Change-Id: Id2f1480e4996f8c4e1856cede8a3adf3907a88bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:13:58 +00:00 |
|
TreeHugger Robot
|
a8e2e5d101
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours am: 24c843fb30 -s ours am: 3648275e0e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I6b47b85bcc95c48fa55a87447367de1a31e30440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:05:25 +00:00 |
|
Bill Yi
|
341f7a1185
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours am: 07b4ad75b4 -s ours am: 69803e4b8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I76910cf8e6a6d55de4878241c5f77eaf1833a956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:05:15 +00:00 |
|
TreeHugger Robot
|
14389d1638
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours am: 95d0cc1766 -s ours am: 6ac3ac9e63 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I2b65ec02b17b221fbe4bbf5220bddf6f451df853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:05:08 +00:00 |
|
Bill Yi
|
cddf29a7dc
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours am: 881db50b16 -s ours am: 88743c60d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I79d2effee11c8b9c514a6875dfb02133780830de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:04:38 +00:00 |
|
TreeHugger Robot
|
e32f2d2b85
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours am: cb5e97de8a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I6ae1a5d5238c34bfeaf30875122d41eaebb34398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:51:02 +00:00 |
|
Brian Lee
|
e07b26752f
|
Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915
Change-Id: Id15ac19f3c27641f06b0f92bf572350d58adab21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:50:48 +00:00 |
|
TreeHugger Robot
|
7d260c1654
|
Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I8864a3d4ea5426644b4e61ac2e74c303e4a1e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:50:26 +00:00 |
|
Bill Yi
|
0d1cc8a7f0
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652 am: 5bdc27be54 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I305c177e616a687460f04e559187b7e3055e4a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:49:49 +00:00 |
|
Henri Chataing
|
2b70be5485
|
[automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: Idbdfd1f019919eecd92149aeecc29d1c7283f90a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:33:25 +00:00 |
|
Jack Yu
|
7f070778cb
|
[automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours am: 8b0fa20c98 -s ours
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: If060020d1bb33c11421b50a4ff1bdc7c008591e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:33:23 +00:00 |
|
Jack Yu
|
6aa379657d
|
[automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours am: 3c0d7c9bfb -s ours
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: I4efffbe58669c8546ba5ba316f8fc76455500606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:33:20 +00:00 |
|
Jack Yu
|
0800590570
|
[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours am: bac3cfcbfe -s ours
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: I06d2a597c142727de07804b53e5dbb75f3881ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:32:31 +00:00 |
|
TreeHugger Robot
|
6d3a9b40d4
|
Merge "Clarify string for translation" into udc-dev
|
2023-02-23 20:28:58 +00:00 |
|
Automerger Merge Worker
|
1b93660219
|
Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev am: 3e158cd48b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642
Change-Id: I4e3aa37e75fde2c35794f3c1cf498300499d1522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:13:25 +00:00 |
|
Diya Bera
|
eed71624c3
|
Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 am: 1da59b0eab am: b0fb8ebc95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844
Change-Id: I5eb5c4df4bfa6fd98b607df89da8155261d7247d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:03:57 +00:00 |
|
Nikhil Kumar
|
68b7328ea5
|
Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev am: 8e67abccae am: 4096329efa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21539124
Change-Id: I41189a6b367e6bbfe15b8cf5caa36c2cc1ad4794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:03:30 +00:00 |
|
YK Hung
|
80c44546cc
|
Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev am: 629782cc88 am: edb878db1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537109
Change-Id: I629f5d21c84324b8bf9f388c1ed1d0d7c69e45b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:03:04 +00:00 |
|
YK Hung
|
8d48c6802f
|
Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0 am: fd3b8bc1dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009
Change-Id: I801fa9d066df4bba92d7ee846e29f65b00d72b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:02:37 +00:00 |
|
YK Hung
|
3ce2da64a6
|
Merge "Fix b/270296263: Updates screen system component name to "Display"" into udc-dev am: 405bea531a am: cc207d81a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537106
Change-Id: I21ebce2e7233e97315cd3ce5efcacf82b5d2c587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:02:19 +00:00 |
|
TreeHugger Robot
|
6cb9363b7b
|
Merge "Cleaned up the deprecated APIs" into udc-dev am: 22a620dbd4 am: 3105ce9819
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21528007
Change-Id: I85789a3f1aebe09a395f0e2885f024b5e7d12412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 19:26:13 +00:00 |
|
TreeHugger Robot
|
34a75bf63a
|
Merge changes from topic "tc_change_23022120_23" into udc-dev am: 1e410e7a11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269
Change-Id: Ide8718367cf66bc5a6cb5bdfa1f3a62e5677df71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 19:14:40 +00:00 |
|
Bill Yi
|
2ab0d2d710
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a am: 2f3719e7f8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269
Change-Id: I439482d032687632e6d665f8831cf00ac2d80378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 19:14:21 +00:00 |
|
Jeff DeCew
|
987f406a2e
|
Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c am: 05c43c2edc am: da1f2578a0 am: 2a269d9b76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805
Change-Id: I99fd42c960243d3199e5d5bbc88cfa4f4f07501f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 19:08:17 +00:00 |
|
Chaohui Wang
|
9bbdfeddc4
|
Merge "Update HomePageProvider to use getSettingsPage" into udc-dev am: 6461dc3814 am: 81aecc52a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489365
Change-Id: Ic72834777d8beb869fb53005c0cc3ce9719a85e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 19:07:41 +00:00 |
|
TreeHugger Robot
|
e6126b37d9
|
Merge "Reduce jank on DND apps page" into tm-qpr-dev am: 694742152d am: 2ecd05add8 am: 408a4045f1 am: 156ef43064
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477350
Change-Id: I3cc3e5c3039680316476b45d52b348d1f84645b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 18:58:57 +00:00 |
|
Diya Bera
|
b0fb8ebc95
|
Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac am: 65721576d8 am: 1da59b0eab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844
Change-Id: I18341d77c718d5ad5fb04ca488bd2f284c479e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 18:33:39 +00:00 |
|
Nikhil Kumar
|
4096329efa
|
Merge "Removed isWorkProfile_withSystemUser_returnFalse test" into udc-dev am: 8e67abccae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21539124
Change-Id: I69701d8d501c9207cc17c413519be2cad116cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 18:33:17 +00:00 |
|
Jiaming Liu
|
b523732b22
|
[automerger skipped] Fix build for jetpack update am: da7f685695 -s ours am: c0e3bdd218 -s ours am: addeccd855 -s ours am: 4fb46658b0 -s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 1c0af48f8c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482786
Change-Id: I02a9238f2bbc4cc948eea3af1ca6871cfba8085d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 18:19:12 +00:00 |
|
Diego Vela
|
a2873471ea
|
[automerger skipped] Update ActivityEmbedding usage. am: 585a7f3c7a -s ours am: 798e242964 -s ours am: 542b1141c6 -s ours am: 42eb9e2878 -s ours
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 d2dfc4285e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21482785
Change-Id: I29c8387bd51396b6ba4e4aa6b96cceae4ed0bae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 18:19:01 +00:00 |
|
Florian Mayer
|
1d86531600
|
Merge "Disable MTE developer option if device config overrides it"
|
2023-02-23 17:57:59 +00:00 |
|
YK Hung
|
edb878db1b
|
Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev am: 629782cc88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21537109
Change-Id: I3298a3ce189f806219b961c8c733621417309699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 17:55:20 +00:00 |
|
YK Hung
|
fd3b8bc1dd
|
Merge "Fix b/265364509 Update battery usage page footer string" into udc-dev am: c74a6b4fb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21535009
Change-Id: I7933641404c7cbeccc7d8057e66d8a9bd9cdb4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 17:55:03 +00:00 |
|