PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,778 Commits 1 Branch 0 Tags
d2f91d47ca586a74ea11401b43b1a145e2e0e7ca
Commit Graph

49713 Commits

Author SHA1 Message Date
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
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
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
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
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
Justin Gross
b9d09dddda 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: I4bed3fa8bf3800894c159b2e6c11361ee1cf0cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 19:25:12 +00:00
Justin Gross
b70ec810f7 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 7dd84f9399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

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

Change-Id: Id08742370d36beeacedcad6538c8482c465b0324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:36:49 +00:00
Treehugger Robot
13c488fc3c Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb am: 065885622b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343

Change-Id: I938c2414fec70253fa4c38f8e5959d04e121e2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:36:44 +00:00
Treehugger Robot
065885622b Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343

Change-Id: Iee500ce4346a8554a37a4ff98ae5f3775b3ad411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 18:03:19 +00:00
Justin Gross
89e829e3dc Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev 2023-06-05 18:00:15 +00:00
Treehugger Robot
dbec7ba7fb Merge "Use custom action key icon" into udc-qpr-dev 2023-06-05 16:56:35 +00:00
ykhung
ab5e21ec07 Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97 am: 7dec603727 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957

Change-Id: Ida834748587c6ad730a72dc510e9b21720ee9152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 07:45:38 +00:00
ykhung
7dec603727 Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957

Change-Id: I42405b0eef20370cc6a838d1040149f9a635d391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 07:02:11 +00:00
ykhung
53f48c4a97 Make the estimator cache logic is the same as SysUI flow 
Ensure the remaining time estimator cache logic is the same as SysUI
https://source.corp.google.com/android/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java;l=375-386

Test: presubmit
Fix: 285747156
Change-Id: If7218dc70792aafaec45c71018897bed80df7f3d
 2023-06-05 01:39:41 +00:00
TreeHugger Robot
f6f0c966a9 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 565f4b5730 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I045be75427f44db3ca778391bb64cbfe81822c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 23:10:47 +00:00
TreeHugger Robot
916c168218 Merge "Add @UsesReflection to FeatureFactory reflection usage" 2023-06-02 22:47:10 +00:00
TreeHugger Robot
4834abe241 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:23:17 +00:00
TreeHugger Robot
701610cd39 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: ac91d63f00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I240fa0143b223161965c470d6eaae678c0133026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:21:54 +00:00
TreeHugger Robot
565f4b5730 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I2bc382165446ca91d4662b151174463781ae5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 22:21:34 +00:00
TreeHugger Robot
f0503e2a51 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 21:36:40 +00:00
TreeHugger Robot
25d24e0cf0 Merge "Restrict SimDialogActivity" into udc-dev 2023-06-02 20:41:47 +00:00
Jared Duke
2278b3f952 Add @UsesReflection to FeatureFactory reflection usage 
Ensure FeatureFactory implementations are kept using a @UsesReflection
annotation at the callsite where they are instantiated via reflection.

Bug: 272041779
Test: m + validate FeatureFactoryImpl is kept
Change-Id: Ia9b8c4fd2c438805f33561dcacd5c10ed49dee19
 2023-06-02 20:30:39 +00:00
Jason Chiu
a655b96c28 Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155 am: 3812b37db7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247

Change-Id: Icfcbba42c812f93f7ee960f7f4aa46ba1d337c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 18:28:38 +00:00