Taran Singh
3dece06cb3
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8
-s ours am: 76f3f2efe8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I00f3139da559d02c442c83cd68b6035f7f535a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:15:29 +00:00
Treehugger Robot
4c0c2f4fe4
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce
-s ours am: 2c62993aca
-s ours am: 71bf0d7467
-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: I524f0910d51c30a4ed480ffdeb9e87f59a1746d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:15:10 +00:00
Taran Singh
ebe5235c23
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-s ours am: 02ef9c46ec
-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: Ie5953b8f10b835ef6593f406e00c9313822a0b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:15:06 +00:00
Treehugger Robot
6976a3137c
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev
2023-07-06 21:55:15 +00:00
Treehugger Robot
a81ed851af
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5
-s ours am: 78d86e927c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I0e7018a6fbb3c46cb311e4930f556355c8572593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:58 +00:00
Taran Singh
56c4d2a5a5
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb
-s ours am: c07555d438
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I6e1609405cf56340e1bd6e27ebc5f52727124c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:56 +00:00
Treehugger Robot
58c1caf910
[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: f87cff76ff
-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: Iac2b4bfc2e421c4f32d28d9bb82651e66a9f7c14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:45 +00:00
Taran Singh
ea2893fc07
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours am: 14f11e845b
-s ours am: 2ac035a723
-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: I7b58ccb278aeee94b27d0e54e42992db0ba364df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:42 +00:00
Treehugger Robot
3c039ca648
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I3600c6f5384fc127e090f0f21a4ad97163b91438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:40 +00:00
Taran Singh
c362ee7dc2
DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: Iaab0f378348324755deffaf9e585aa25a6b46e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:38 +00:00
Treehugger Robot
78d86e927c
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: If0574725dc2bec4837c1554351fffc9419a6723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:29 +00:00
Taran Singh
c07555d438
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I1ce4bda4ba2ba024a6d1228df1ee0cf105c51854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:26 +00:00
Treehugger Robot
30ea3d3cec
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: Ifbc675e660f46bc43dd1581e21b6e16fc707603a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:43 +00:00
Taran Singh
76f3f2efe8
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: I5cfb018ad56154d13a0ff8d610094918e35ea74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:40 +00:00
Treehugger Robot
71bf0d7467
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce
-s ours am: 2c62993aca
-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: I14e24b0371cbd5bd5380b6f4a4ddf2a40989f472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:09 +00:00
Taran Singh
02ef9c46ec
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-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: Ifb4be3245cc2129523eff706cb2090902c6a7b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:05 +00:00
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
6cf9c58fa5
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev
2023-07-06 21:15:44 +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
danielwbhuang
f76c528e5b
Use EXTRA_ENTRYPOINT to log entry point for metrics
...
1. Extra name: EXTRA_ENTRYPOINT
2. Value: integer which is from SettingsEnums.EntryPointType
// access physical keyboard settings through keyboard configured notification entry point
KEYBOARD_CONFIGURED_NOTIFICATION = 0;
// access physical keyboard settings through keyboard settings entry point
KEYBOARD_SETTINGS = 1;
// access physical keyboard settings through connected devices settings entry point
CONNECTED_DEVICES_SETTINGS = 2;
Bug: 271391879
Test: manual and check the device log.
Change-Id: I0d5144790e184eb3374d4615d8874619c372742a
2023-07-06 21:02:30 +08:00
dshivangi
8f4122ad5d
Add 'Stay unlocked on fold' toogle to settings
...
Added 'Stay unlocked on fold' toogle to display settings. Enabling this
setting will allow user to keep their device awake after the fold the
device.
Test: atest StayAwakeOnFoldPreferenceControllerTest LogicalDisplayMapperTest
Test: manual
Built and flashed foldable device and manually tested by
1. unfolded device -> enable setting -> folded device
2. unfolded device -> disabled setting -> folded devices
Built and flashed non-foldable device and manually tested by
1. Went to Settings -> display -> the toogle setting is not visible
Bug: 274447767
Change-Id: I35fbd0f5d1297ee6e14896e8f3be8301cda6622f
2023-07-06 11:42:35 +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
Patty Huang
627a584f39
Do not show LE audio toggle in Device Detail by default
...
Bug: 289884263
Bug: 289957406
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is not shown in Device Detail by default
Change-Id: I2c6430c791dd852d238d7122a72f218f395c4a0b
2023-07-05 11:51:50 +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
Angela Wang
2539a6a10e
Enable scrolling in screen flash color selector dialog
...
Screen flash color selector dialog doesn't display correctly in
landscappe mode when adjust to large display size from 'Accessibility >
Display size and text > Display size'. Make the layout be scrollable to
prevent strange clipped UI.
Bug:287671988
Test: check the UI manually
Change-Id: I37eb604d362fe4373d26f97a9397230babc6eafd
2023-07-04 07:56:31 +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
Vania Januar
ebc0b9c323
Do not show a summary in Tail button preferences if no app found
...
Bug: 289054758
Test: StylusDevicesControllerTest
Change-Id: I985194b2e64d36844a9b88f19394db2728ea70e4
2023-07-03 14:44:59 +01: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