TreeHugger Robot
|
d98811b04b
|
[automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719
Change-Id: I63e194734a8707cd5eed8b904e0cf7f7800580ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 03:33:27 +00:00 |
|
TreeHugger Robot
|
d35e1c4426
|
[automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719
Change-Id: I8214b8ebbd85770f9f6b0c2fe4e4f14ccf0c5423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 03:28:15 +00:00 |
|
Hao Dong
|
b0ff672a7e
|
Post-enroll settings screen shows class 3 strings
Test: atest FaceSettingsFooterPreferenceControllerTest
Test: manual test
Bug: 274959218
Change-Id: I2e30666baf36a48a47e9ed9e4e046cefc805995a
|
2023-03-31 03:05:57 +00:00 |
|
TreeHugger Robot
|
f8717edcbd
|
[automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719
Change-Id: Ic83c4f5c399c330f0c0d080d0e798bd7335bc7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 01:58:30 +00:00 |
|
TreeHugger Robot
|
a3b1d11839
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 am: a1bd3746e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ib7761fcfe910e1116131d7868edf1f89c3416849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 01:32:26 +00:00 |
|
TreeHugger Robot
|
3771564adc
|
Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719
Change-Id: I54ad21af66956d5711a72f587d9af4c8389a185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 01:23:13 +00:00 |
|
TreeHugger Robot
|
3d473b86a4
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 am: 15343f6585
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ie8123290c29d6560ad10aa0da19573a2f28a5e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 01:00:59 +00:00 |
|
TreeHugger Robot
|
15343f6585
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: I17c98e3c717fe86f31e19be40f660b73d6a5cce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 00:56:10 +00:00 |
|
Julia Reynolds
|
e6cb3523f5
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours am: 765f392ccc -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Icf19550d8b9ac596aedf0211e6f0338426d37d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 00:52:59 +00:00 |
|
Julia Reynolds
|
f0ff5a7746
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours am: 07fcd1f503 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I70e0c6fbd099d9730092d492d8d2c68cf27f780b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 00:30:44 +00:00 |
|
TreeHugger Robot
|
0362083f3a
|
Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev
|
2023-03-31 00:20:15 +00:00 |
|
Julia Reynolds
|
765f392ccc
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I24d48fe50abd94b3dfb6e1df3a9a6d4a9be6a1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-31 00:14:13 +00:00 |
|
Automerger Merge Worker
|
0a95552222
|
Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours am: 9595f67163 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I2e0615cf6fb474f7e19be108bfe14710a9e323fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:55:21 +00:00 |
|
Julia Reynolds
|
f41913fbf0
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours am: fd60b8f6e2 -s ours am: 6586a5b108 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ib79d7b8b00fd8300b85ec682eebcf34dbc1ed63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:55:19 +00:00 |
|
TreeHugger Robot
|
5b43b412fc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours am: 7c6a59f183 -s ours am: acbbbf6a33 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I8614379d0cb83d43f78a02ee645df59a7bc201de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:53:28 +00:00 |
|
Bill Yi
|
fb4d6ef8a5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours am: 9f71ec4375 -s ours am: 9ce48d9526 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I65ac1372a1190e2130caee674cd9f58441d0872a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:53:22 +00:00 |
|
TreeHugger Robot
|
6779739a27
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -s ours am: d1eff9d22e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I1fc4be5dab03c1236a7947b3cc30b3959ae540ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:53:07 +00:00 |
|
Bill Yi
|
3db86cf4a2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -s ours am: 21639e3e78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I769d335d852bab99c1478f82ba47a86771c8cefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:52:58 +00:00 |
|
TreeHugger Robot
|
a1bd3746e6
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ic321f309e935c06f785a9ddb9e3e5314ae0f9131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:49:27 +00:00 |
|
Automerger Merge Worker
|
855c2db73b
|
Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours am: c22e3947f5 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ic2a207cd20ce67f113b586476a1684b565407bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:38:41 +00:00 |
|
Julia Reynolds
|
18105e91a5
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours am: fd60b8f6e2 -s ours am: 0f81ebfda9 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I0670186ef0463c324e84d3df8afafbd380044126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:38:39 +00:00 |
|
Automerger Merge Worker
|
9595f67163
|
Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I0f3e6f4dbb800506857a2b887eb11fefcfffe20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:15:05 +00:00 |
|
Julia Reynolds
|
6586a5b108
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours am: fd60b8f6e2 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ibf735b4dd8915d542f062c3d3419f85ca38e2639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:15:02 +00:00 |
|
TreeHugger Robot
|
acbbbf6a33
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours am: 7c6a59f183 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I9ade333d9592594c86fc244eb3fcf7309bcfbe6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:09:17 +00:00 |
|
Bill Yi
|
9ce48d9526
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours am: 9f71ec4375 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I2feb1ef756f0bee037eda641bf8e6eac52839160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:09:14 +00:00 |
|
TreeHugger Robot
|
d1eff9d22e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I99ca19c6875727956eae08093c323f6201f300ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:09:01 +00:00 |
|
Bill Yi
|
21639e3e78
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I21b6e933dba55a92dc44c15e3e49fbe041855ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 23:08:46 +00:00 |
|
TreeHugger Robot
|
af928aa761
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours am: 7c6a59f183 -s ours am: 930b2d4907 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Ie99c499856e71e74d1152f336f5064f1eb7ba1ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:27:58 +00:00 |
|
Bill Yi
|
11d28e5df4
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours am: 9f71ec4375 -s ours am: 5c8af76e32 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I94ce1c511c6032c838ac7a85c898804d4cecc7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:27:54 +00:00 |
|
TreeHugger Robot
|
3880ff7203
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -s ours am: 8b9d7a3330 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: If7fa42b17ff4c77fd4ef7376b8d6ded22dfffaac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:27:48 +00:00 |
|
Bill Yi
|
e6e680b8b1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -s ours am: a53df4df90 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I23a599055a0db83ea6298e74c76e42319dc73a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:27:24 +00:00 |
|
Chris Antol
|
7bfd10736c
|
Enable hover states for SeekBarPreference
Bug: 201499839
Test: manual testing on pixel device with wired mouse
Note: change was originally set for TM-QPR branch, but now targeting UDC-DEV instead
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec11542cbe14f874c9fe17ee4c2a4c4e29ea748c)
Merged-In: Ibbbd0e0ef627576acb5eb3f4acb6d40dcceb0371
Change-Id: Ibbbd0e0ef627576acb5eb3f4acb6d40dcceb0371
|
2023-03-30 22:24:26 +00:00 |
|
TreeHugger Robot
|
dae7483e00
|
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd am: d8ca3881ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I0bba2171136def9647ea91721d86246ee8e3c135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:16:28 +00:00 |
|
Julia Reynolds
|
07fcd1f503
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie868cf81b7b518fdbe90482cd88b8fc2206cf165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:16:23 +00:00 |
|
TreeHugger Robot
|
91bc8bc27f
|
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c am: 488b5beb34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: If6d91def7184291656b1c906ab9deb2860f3152c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:16:18 +00:00 |
|
TreeHugger Robot
|
d84e6a2b2b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours am: d7b40a08fd -s ours am: 49e36c9c55 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: Ic87f2b0a95247e7b4807e070d65268b377ca10e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:16:04 +00:00 |
|
Yanting Yang
|
1c3450808e
|
Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev am: bc12caac88 am: 72b8392b23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22343650
Change-Id: I9b6a41173e65739edf015b0845cde472e242c501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 22:06:45 +00:00 |
|
Automerger Merge Worker
|
c22e3947f5
|
Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ia18251a7a159984c6fcaf9a92cdc169196df1fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:27:48 +00:00 |
|
Julia Reynolds
|
0f81ebfda9
|
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours am: fd60b8f6e2 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Iab57a8f2cde0d209093b57b09816fa594fe25ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:26:08 +00:00 |
|
TreeHugger Robot
|
49a58eb2a7
|
Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d am: c807f85dc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252
Change-Id: I5d76d36ebeb5bdaf77d893675a420279899615f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:16:26 +00:00 |
|
TreeHugger Robot
|
17b90b50b4
|
Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821 am: e23eed7706
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564
Change-Id: I13e96a858ca802f4ace991b9c9ca50be1762559a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:16:16 +00:00 |
|
TreeHugger Robot
|
25a5b4e321
|
Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18 am: 98e2c7dbf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477
Change-Id: I4f10788a72066cc4d26c702fd9f993a114be0854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:16:06 +00:00 |
|
TreeHugger Robot
|
11cca623bd
|
Merge "Remove unused listener" into udc-dev am: a99c64dfde am: a9bb4e14f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269
Change-Id: Ic558a83d37bdf0207626014c26284e632231e377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 21:15:27 +00:00 |
|
TreeHugger Robot
|
930b2d4907
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours am: 7c6a59f183 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I408bc5e28097b0eee96f9f8eb16b975c9fbe6346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:31 +00:00 |
|
Bill Yi
|
5c8af76e32
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours am: 9f71ec4375 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I5e77adbef43aa18efcc5127ff3313653c9c91bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:27 +00:00 |
|
TreeHugger Robot
|
8b9d7a3330
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I86b674308bc16b69734d3e0482a5293700e08593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:15 +00:00 |
|
Bill Yi
|
a53df4df90
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I612c59bd37ed8bada17680d9e950e590570652f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:47:01 +00:00 |
|
TreeHugger Robot
|
17e504f6a8
|
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: Ibfe01c87ea15467a736ccaf7d812c8eaffaefa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:39:38 +00:00 |
|
TreeHugger Robot
|
3b74f7a188
|
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd am: 76932b5ee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: Ic5000b6d94276c6306d20b4335389f9697f68ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:10:56 +00:00 |
|
TreeHugger Robot
|
93e48fba81
|
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c am: 8838d8639d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: Ifa3cb5a55134c0cf3cddd3390cd5b7884fb57e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-30 20:10:44 +00:00 |
|