Treehugger Robot
9fa4b1e0a6
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev
2023-07-06 21:18:12 +00:00
Treehugger Robot
376bf07767
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev
2023-07-06 21:17:45 +00:00
Treehugger Robot
25522ce664
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I6fc9be3afa74d954bf2949ba9a4f555905304edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:08:55 +00:00
Taran Singh
eda2ffbeca
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Ifa32ff76702ededcc32e36c975c35db920e343ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:08:52 +00:00
Treehugger Robot
f87cff76ff
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
-s ours am: faa7a8af3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I7672d7a7fd2be3c0fb1b794e57b26d0e270e9dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:05:45 +00:00
Taran Singh
2ac035a723
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours am: 14f11e845b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I840417aa2a6033b66b08c2281e31d12410b0fbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:05:43 +00:00
Treehugger Robot
2c62993aca
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I3fd1ff543e6633ff4141e771bdc24aac9a6de72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:46:31 +00:00
Taran Singh
a8bd8948d1
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I508c24a6e322088a28f3777ec05756818690f73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:46:29 +00:00
Treehugger Robot
faa7a8af3d
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I46d1a6d58214292929bc45c769cca4005c2aa4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:42:59 +00:00
Taran Singh
14f11e845b
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I3abe84b4918e7be076136db9abc4589bf0bd8633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:42:54 +00:00
Treehugger Robot
8e3d6f0a10
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev
2023-07-06 20:35:41 +00:00
Treehugger Robot
fbe97f1ee4
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev
2023-07-06 20:04:21 +00:00
Treehugger Robot
e5f9ab14ce
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev
2023-07-06 19:53:12 +00:00
Hao Dong
bee02bbbe7
Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev
2023-07-06 18:45:27 +00:00
Tetiana Meronyk
8141b10269
Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev
2023-07-06 13:17:36 +00:00
Rhed Jao
2070808a62
Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev
2023-07-06 02:36:45 +00:00
Quang Luong
062c4b634d
Merge "Use speed string from WifiEntry" into udc-qpr-dev
2023-07-06 01:49:56 +00:00
Michael Mikhail
8f88d32f18
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ia4c82cc1a96ab511fe58aa3747082931304fc68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:33:59 +00:00
Michael Mikhail
7c53d299a2
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:23 +00:00
Michael Mikhail
83c13d6563
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Treehugger Robot
b2f436f310
Merge "Fix test case failure." into udc-qpr-dev
2023-07-05 08:44:06 +00:00
Yi-Ling Chuang
434a04b32c
Fix test case failure.
...
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.
Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
2023-07-05 15:43:34 +08:00
Tetiana Meronyk
b88bad678d
Fix "Allow guest to use telephony" toggle not updating its value
...
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
2023-07-04 15:32:14 +00:00
Rhed Jao
6c7e4560a2
Update strings for the repair mode lock password screen
...
Bug: 289325981
Test: build
Change-Id: I347397fa0445436a231bc82529215c6031e4d80d
2023-07-04 09:44:50 +00:00
Chaohui Wang
a51e013746
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 09:03:56 +00:00
Chaohui Wang
d42cc8e5e2
Fix DataUsagePreferenceController ANR
...
Offload calculation work from main thread to fix.
Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
2023-07-04 12:06:53 +08:00
Daniel Huang
114d068fbb
Merge "Log metrics for PK settings topics" into udc-qpr-dev
2023-07-04 02:26:13 +00:00
Hao Dong
fefda226f7
Add super call in FingerprintEnrollEnrolling onConfigurationChanged.
...
Test: N/A - fix a crash
Bug: 289458339
Change-Id: Id34b1036fe12079b14cd3aaa0a85eecc138e6b17
2023-06-30 21:29:07 +00:00
Allen Su
5d207a7b4b
Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev
2023-06-30 16:08:25 +00:00
Treehugger Robot
dc98948cc1
Merge "Check P2P channel before requesting network info" into udc-qpr-dev
2023-06-30 14:48:12 +00:00
Michael Mikhail
c156b6c427
Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-06-30 12:56:45 +00:00
Treehugger Robot
369a1097c8
Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev
2023-06-30 06:55:47 +00:00
tom hsu
0b3da89a91
[Settings] Fix inactive SIM show display name with subectiption id.
...
- Cached active SIM' display name with last 4 digits phone number to
avoid that this active SIM change to inactive SIM then show the
display name with subscription id.
Bug: 271567615
Test: Manual test passed
Test: atest passed
Change-Id: I119d60ab4e92b1f04fb42f96df10bc81aa378a7c
2023-06-30 05:51:40 +00:00
Zoey Chen
3a7c5d9fa1
Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev
2023-06-30 04:18:16 +00:00
Quang Anh Luong
36d71f8785
Check P2P channel before requesting network info
...
WifiP2pSettings requests network info from WifiP2pManager whenever it
gets onDeviceInfoAvailable, but sChannel may be null causing an
IllegalArgumentException. Check that sChannel is not null before
requesting network info.
Bug: 289004627
Test: atest WifiP2pSettingsTest
Change-Id: Ied8c3f8a894683d7b8e368e5c52343adb7d05e4b
2023-06-30 12:21:30 +09:00
Zoey Chen
6358f613cf
[Panlingual] Change the metric's string in Languages
...
Bug: 279915462
Test: manual
Change-Id: I8e59f9acb068640da64d2a29cc6074b388994554
2023-06-30 02:59:10 +00:00
Hao Dong
81edf4d6f1
[automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25
-s ours
...
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033
Change-Id: I35e212d33563d4a1c90298723d4b05d3c6560ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:11:05 +00:00
Hao Dong
d69fbd1daa
[automerger skipped] Fix pattern rotation header text. am: 7b99d92464
-s ours
...
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033
Change-Id: Ic8bb8b1778222af56932685c8fdbceedc4b35fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:11:02 +00:00
Hao Dong
83e4a8a32d
[automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
-s ours
...
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: I2e657a847d2f74b1b81d8f8d3bf53cd8aaba98ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:10:41 +00:00
Hao Dong
e0aa02b138
[automerger skipped] Fix Fingerprint enrollment UI when display size is largest. am: 2ca3f3232c
-s ours
...
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: Ia2b3d388b9a19eadd251f3bd847a7708134bf0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:10:39 +00:00
Matías Hernández
ba88ece9fb
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours am: 7088dd37ec
-s ours am: e0b9249359
-s ours am: 62bd80ee29
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ife75d0a4306230505cc01d3fcbad4faf45f0e0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:10:13 +00:00
Hao Dong
04b1932b25
Merge "Fix pattern rotation header text." into udc-d1-dev
2023-06-29 23:52:00 +00:00
Hao Dong
72f2058d3e
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
2023-06-29 23:51:50 +00:00
Matías Hernández
62bd80ee29
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours am: 7088dd37ec
-s ours am: e0b9249359
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Icf19a7292abc519f50a74bbfeae77467106c486d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 23:22:41 +00:00
Matías Hernández
e0b9249359
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours am: 7088dd37ec
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I563b580a28e6e46cdb31ee815a7b9552e82bd2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 22:35:02 +00:00
Matías Hernández
c06e16ffe7
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: b280f8792e
-s ours am: ae1f3e9159
-s ours am: f64fefb48d
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ic28a2798731b745a620899e4638393a5985ef956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 22:13:03 +00:00
Matías Hernández
7088dd37ec
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I3aaeacc0f707d6a3c72fedf74aba8cb76a1ad6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:55:19 +00:00
Matías Hernández
f64fefb48d
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: b280f8792e
-s ours am: ae1f3e9159
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I261e8b4b37c787b890a7fa69fe2ffcd6718225c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:31:04 +00:00
Matías Hernández
ae1f3e9159
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: b280f8792e
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ie7d37b0a284c1c09b4760ba7c01bedf2327ee3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:03:28 +00:00
Matías Hernández
0d3e0dc397
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I240139ad6fd2072b7c2990a20423dfeed10b9763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 20:22:12 +00:00