Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,863 Commits 1 Branch 0 Tags
a194cfd0e9641e75f7fe38f24c031d43b4d3533f
Commit Graph

49734 Commits

Author SHA1 Message Date
Mady Mellor
aabf96a1c3 Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369 am: ee31358597 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273

Change-Id: I7e495da8b325296a9e7b1e3beccda822a620e1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 19:03:18 +00:00
Mady Mellor
8a47899369 Merge "Fix colors in bubble settings so they're more visible" into udc-dev 2023-06-08 17:35:55 +00:00
Mady Mellor
f184678802 Fix colors in bubble settings so they're more visible 
Test: manual - get a bubble, go to that apps bubble settings screen,
               observe the colors look correct, switch theme and
               check again.
Bug: 283951560
Change-Id: I361b1c20e293c02b4d604e0b5845a074c31e5103
 2023-06-08 09:21:13 -07:00
Joanne Chung
f2a325a25e Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 am: 16a3800902 am: 89c82f5894 am: bba1da3581 am: 802cb9f24e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: I140afd52029a38aa26f26dd8da330937ecf7e86e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 11:08:57 +00:00
Joanne Chung
802cb9f24e Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 am: 16a3800902 am: 89c82f5894 am: bba1da3581 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: I699a4f8354d88381b4a3be7ddcc090b51beaf377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 10:13:23 +00:00
Joanne Chung
bba1da3581 Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 am: 16a3800902 am: 89c82f5894 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: If78b849b1dd873d3c3bdc3b549feb3e426a4df38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 09:36:36 +00:00
Joanne Chung
89c82f5894 Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 am: 16a3800902 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: Ica9e62112a10211e4ed6a7dd2633ff86050df231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 08:53:40 +00:00
Joanne Chung
16a3800902 Merge "Update OWNER file to new owner" am: 6c84f9128d am: e7b01f0ce8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: I7dd7e11968e601d180cb928dd6dcb0803dedf523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 08:05:03 +00:00
Joanne Chung
e7b01f0ce8 Merge "Update OWNER file to new owner" am: 6c84f9128d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: Ie7ac04781ba486dd74af1df57a995636453eb21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 07:23:35 +00:00
Joanne Chung
674ae4ae93 Update OWNER file to new owner 
Bug: 177641730
Change-Id: I68e9986338e04bb81a11a495f6de1657399b5742
Test: n/a. Only update owner
 2023-06-08 06:40:41 +00:00
Aleksandar Kiridžić
94b8257176 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483 am: e2d8e56c61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: Ic78a3af95c49680efc5bad6e3d13e7d6abb048f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 20:53:07 +00:00
Hao Dong
d2f91d47ca Merge "Clean up multi window toast on FingerprintEnrollEnrolling." 2023-06-07 20:35:18 +00:00
Aleksandar Kiridžić
1c249415ba Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: 85bc7cf3e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I1eadf56c453c144199e8d4b7e0fdb8b4a2bf2de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 20:03:19 +00:00
Aleksandar Kiridžić
e2d8e56c61 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 am: c449423483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I18fd5f9209b5c7dc965ffed95751f8059eb95c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 20:03:18 +00:00
Aleksandar Kiridžić
c449423483 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I9ead6c07f3f8c8b901301a7eed9de148490b4bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 18:43:15 +00:00
Aleksandar Kiridžić
9b20255944 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I3b15f067f124ff17d7c540e2ca9dff5100178bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 18:38:59 +00:00
Hao Dong
3d81e3893e Clean up multi window toast on FingerprintEnrollEnrolling. 
ag/22361082 and ag/22460413 have added a dialog preventing entering
FingerprintEnrollEnrolling. So showing toast and early return in
onCreate() will never be reached. This CL cleans up this obsolete code
block.

Bug: 283244022
Test: N/A

Change-Id: Ifc5f3d909a275c735035146e44f70d2b5d5b51e3
 2023-06-07 18:19:13 +00:00
Aleksandar Kiridžić
b5b15a6689 Merge "speech: On-device recognition settings profile selector" into udc-dev 2023-06-07 17:53:38 +00:00
TreeHugger Robot
734d68d694 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1 am: 99c0145565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Id1dacaca9b06530ae9431faaf8a36783e2280576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 14:24:22 +00:00
TreeHugger Robot
9f8053aac4 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 19f1707fda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I2e1fe66bd5a0672c8b8a20bd2c389cdba826b6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 13:40:51 +00:00
TreeHugger Robot
99c0145565 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: Ie47f1d1d909d7f753619ff91041e24d58ae934fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 13:40:42 +00:00
TreeHugger Robot
9b68c3c9c1 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I5f9975f49ec0793eabf171c5dba0791683ab0d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 13:03:22 +00:00
TreeHugger Robot
5943e14bc3 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I31a51edc4d856fab0127545e6e6acdf547c027c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 12:59:49 +00:00
TreeHugger Robot
3e374cc7a7 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev 2023-06-07 12:13:51 +00:00
tom hsu
bf7865b27e [Settings] Fix crash when user enter bluetooth page quickly. 
- When SliceManager try to pinSlice, process may not have the permssion
   yet, so in Androix lib it use try/catch to avoid Security exception.
   However, if SliceManger quickly unpinSlice after pinSlice, process
   may still not get the permission yet, then due to no security
   exception, it cause the settings crash.

Bug: 283065718
Test: atest passed
Test: Manual test passed
Change-Id: I2293fca73e65dfaa34237abe57e0c6a3fe0f62bb
 2023-06-07 09:37:21 +00:00
SongFerng Wang
11c126e153 Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2 am: 1f80bf93aa am: 375259c986 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644

Change-Id: I8011abd3fa8fcebca7205587601730abc65144f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 05:24:34 +00:00
SongFerng Wang
375259c986 Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2 am: 1f80bf93aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644

Change-Id: I0dfbb7d60d5b329c5fd72af814ba27a0abad917a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 04:34:11 +00:00
SongFerng Wang
996ad117ae Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c am: 3a07547d81 am: dfaa1b0337 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: I8342dcb776700308606cacb4714ba00012e13445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 03:37:28 +00:00
SongFerng Wang
1f80bf93aa Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644

Change-Id: I51d34675109e1b428e0c1c45941f0462bf55b1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 03:32:04 +00:00
SongFerng Wang
dfaa1b0337 Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c am: 3a07547d81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: Ib2d81c7e382968788ae084e2d07fa21ca4ee1dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 02:47:50 +00:00
SongFerng Wang
add7deceb2 Merge "Add the log and moving it into onResume" into udc-d1-dev 2023-06-07 02:45:20 +00:00
SongFerng Wang
3a07547d81 Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: I919d6d7e09a7cdff2550bd667a1cb5fcb435b610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 02:05:51 +00:00
SongFerngWang
ea85e3b2fa Add the log and moving it into onResume 
Since user can open two settings app(one is via settings app button and other one is via quick settings) and user can switch them to foreground by the recent page. If user can goto the deviceDetails at Settings_A and then changes the config value at settings_B, then the user goes back Settings_A to check the UI. If config is in the init, the UI can't refresh the UI.
Bug: 285086232
Test: build pass.
Change-Id: I2284940eddcd02c543522b60f951c0d8d25775fd
 2023-06-07 01:45:31 +00:00
SongFerng Wang
4929da451c Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev 2023-06-07 01:33:59 +00:00
Wenhui Yang
71b8076566 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 am: e947da08e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I097e0a9e37fb960118efc10724ebe95efdf7caa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:53:16 +00:00
Wenhui Yang
e947da08e3 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573016

Change-Id: I1aa4a7a33a14adae4a5fcbe1f443b3af89ed674b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:12:54 +00:00
Ale Nijamkin
fd48767844 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: dc6449157b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Ifad706722aa509bcad777a6af0fd4749629eb5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 21:10:27 +00:00
Wenhui Yang
4eceb6c5c5 Merge "Fix face model delete message" into udc-qpr-dev 2023-06-06 21:09:56 +00:00
Ale Nijamkin
163c01ab4c Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:27:23 +00:00
Ale Nijamkin
dc6449157b Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: Iac1b92075d8113012e69bdc82462921191690ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:26:05 +00:00
Ale Nijamkin
d31487b529 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 306421f87f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I6ca144e73e9d3e4465dcfd0325b57add2f61f426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 20:23:19 +00:00
Ale Nijamkin
1e3ecf6352 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:44:29 +00:00
Wenhui Yang
5e71aee4cd Fix face model delete message 
Add new strings for face model deletion when fingerprint unlock is available.

Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
 2023-06-06 19:44:17 +00:00
Ale Nijamkin
ef6f54982a Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I9248f9d94bbd8bbea16c93cd2a1a259fa43fa1d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:41:14 +00:00
Ale Nijamkin
b5dda005fd Merge "Fixes nav stack issue." into udc-dev 2023-06-06 18:48:59 +00:00
Aleksandar Kiridzic
a882fd268d speech: On-device recognition settings profile selector 
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.

Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
 2023-06-06 14:10:34 +01:00
SongFerngWang
13cd052693 ForgetDeviceDialogFragment check whether device is null or not 
Bug: 280687867
Test: build pass
Change-Id: I4134569854165f20f6287406d9ed627b2c15c05b
 2023-06-06 09:53:36 +00:00
Alejandro Nijamkin
6f9f3a4594 Fixes nav stack issue. 
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.

Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.

Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
 2023-06-05 16:02:17 -07:00
Justin Gross
73dcd293c3 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I2753b78613de8d49c3dad49b4b5cd5ce058d0e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:49:39 +00:00
Justin Gross
e8e2f86c4c Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I3463151328ed5ed16afb20616dd4f6e9653ac143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:27:32 +00:00