Commit Graph

130193 Commits

Author SHA1 Message Date
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
Fabián Kozynski
5ec8f8d315 Fix typo in product string
Fix the typo so the string displays in the correct products.

Test: manual, using tablet product
Fixes: 284007230
Change-Id: I970c214f46e0d30ecb92ff8f24c6f3fd8dfe33e3
2023-06-07 12:45:41 -04:00
TreeHugger Robot
83e44f83ae Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 9b68c3c9c1 am: 060250ded2 am: 90f0f3ef3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

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

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

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

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

Change-Id: Icad930081c90a9fd6fdce582d6e293e38ea45a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 14:24:36 +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
d60ff26d9f Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 am: 5943e14bc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I2b2a2671f43ada1de08c5c766dfbbc4cf38b6e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:45:47 +00:00
TreeHugger Robot
060250ded2 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: Ie63476cbbc3efc7d3d00a7b9bcc0c1772d33e327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:44:52 +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
19f1707fda 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: Ia5b21af9f18c286c5f8cdb480209db5859e53e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:03:24 +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
d23d398c91 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: Ic8bad0f315c897e786ab0669cf5fc68b955b0184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 13:03:16 +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
Zoey Chen
3b698670ad [Regional] Change the wording from "Use app default" to "Usw default"
Bug: 282890644
Change-Id: I0735b38afd666895bf9801170bea6178f9ba6292
Test: manual
2023-06-07 12:40:05 +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
George Chang
f43f775563 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 am: 6b83876c1e am: aef49ffac7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I1326dd1ca85e5269e726cd7784729824582ca79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 11:39:53 +00:00
George Chang
af0402acaa Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: f63518f864 am: 2229a3393f am: f836b3ca47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Iba9eab791044682a400568292561e14feaffa5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 11:39:45 +00:00
George Chang
963175ab97 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 am: cb5b26ff73 am: f3160735e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I2b7db8b703c84127cbec1acd64fddbfb5ef20964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 11:39:33 +00:00
George Chang
aef49ffac7 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 am: 6b83876c1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I32a8bdc671ccab0bc2b065b802bf2da5b98cc73d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:58:30 +00:00
George Chang
f836b3ca47 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: f63518f864 am: 2229a3393f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I66076a63ec52972a918f4b16cb6be20d9ee039bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:53:08 +00:00
George Chang
f3160735e4 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796 am: cb5b26ff73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ie331e2ac5c1d3701ae16d123610752e6f6554082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:53:00 +00:00
George Chang
2229a3393f Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: f63518f864
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I3f127a822fff7c5e64918e3b9a1619e67a307309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:15:56 +00:00
George Chang
6b83876c1e Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I4ed20c3448a6b8be5065efd6cad0b1ef765135d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:15:29 +00:00
George Chang
9a3cb029b5 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 4b49493d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ic377f1dd84eac4f051f3695c883ff9986bb02d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:11:22 +00:00
George Chang
cb5b26ff73 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e am: 29dd0bf796
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ibb5362d87f383062376173d2820f8fbb80506deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 10:11:22 +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
George Chang
4b49493d05 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I65f5b640f3f66f69f83cab8f81f6229064f6d363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:33:13 +00:00
George Chang
29dd0bf796 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ifc98c5ea76ad9fb5205ec3421470ebd7bf17473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:33:13 +00:00
George Chang
320068c8ba Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I62de2689b0bee9e65e006bf43230d18fcdb43ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:33:00 +00:00
George Chang
f63518f864 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: I1b0246e219089604709900c2d8deb8d2e3d8a565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 09:29:02 +00:00
George Chang
832e0b015e Merge "Correct typo in the launch via NFC bottom string" into udc-dev 2023-06-07 09:02:51 +00:00
SongFerng Wang
ec688246d6 Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2 am: fb0186c690 am: 9a3ed90542
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644

Change-Id: I050ee581d62afce0b10ed8bb9e460967833f6f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 05:24:42 +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
9a3ed90542 Merge "Add the log and moving it into onResume" into udc-d1-dev am: add7deceb2 am: fb0186c690
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23579644

Change-Id: I3b515b693c81ed1007f7ec229fcf76b5308c90ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 04:39:50 +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
b492294524 Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c am: 8b1bfeef73 am: 7ad90a31bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: Ic02720ce5b969f3e7c1ebb39fac09cf8c525e4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 03:37:47 +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
fb0186c690 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: I991eb37e42817dba11b4b0404fa5915e6a35ab36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 03:36:07 +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
7ad90a31bb Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev am: 4929da451c am: 8b1bfeef73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578859

Change-Id: Ib9b06dbb5570660063dc1c64850867d34b951e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:53:28 +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
8b1bfeef73 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: Ibff4ceef103e798e1e27ee413009ccac92a79cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:09:50 +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