Jack Yu
50f657e1d5
Update page id enum for NFC default payment selection page
...
Bug: 260060603
Test: build pass
Change-Id: I6f3da2223a455f8dfe6b8c5be13af37f933202b8
2022-11-28 02:57:09 +00:00
Chaohui Wang
bf26483af5
Merge "Reduce flaky of App Info tests"
2022-11-28 02:39:14 +00:00
TreeHugger Robot
41a77adafb
Merge "Add page id enum for storage settings"
2022-11-27 06:10:59 +00:00
Chaohui Wang
e62377a1e7
Reduce flaky of App Info tests
...
Bug: 236346018
Test: Unit test
Change-Id: If810ef57675b8fb3bab533360bb62cc41a8cc9d8
2022-11-26 21:04:45 +08:00
Vincent Wang
2687db5de2
Merge "Add test for FingerprintEnrollment"
2022-11-26 08:13:56 +00:00
Bonian Chen
6477275296
[Settings] configuration for hidding SIM settings UI
...
Hide SIM settings UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I13ae0909d0120039cdfe8298a6892195de2fb122
2022-11-25 22:57:50 +00:00
Jackson Michael
e55a53b067
Changing the process to create a new user
...
Creating a method to run in background the process to create a new user, and making the user check and change the UI in the main thread.
Also deleted the message of created user from the handler.
Bug:246906179
Test: Manual test and unit test fixed
Change-Id: Ifb3687937987f04165fd2e099d4334c7571bb034
2022-11-25 20:19:30 +00:00
Nikhil Kumar
b61949c841
Hide remove user option for main user in multi user settings
...
Added isMain() user check in UserDetailsSettings.initialize and
UserDetailsSettings.canDeleteUser to hide and restrict
delete user option for main user in multi user settings.
Added unit tests for the same.
Bug: 260200162
Test: Manual test on headless to check remove user option
is not visible for the main user.
Test: Run robo tests with this command:
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.UserDetailsSettingsTest"
Change-Id: Ia455611a3d0b1e0945f61f00658425b7bf6c2dae
2022-11-25 17:46:20 +00:00
Treehugger Robot
e9efc02e08
[automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435
-s ours am: b02050cbe1
-s ours am: b6c140e7f2
-s ours
...
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2317315
Change-Id: I21ef50cf23575444c0d0a29236f6c324f0756e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 16:16:54 +00:00
Bonian Chen
efa2b04507
[automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256
-s ours am: f10535cf6c
-s ours am: 63cfa3a674
-s ours
...
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2317315
Change-Id: I9e41cb241e6bcd665cd59a00e2b9b8428f72c581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 16:16:47 +00:00
Treehugger Robot
b6c140e7f2
[automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435
-s ours am: b02050cbe1
-s ours
...
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2317315
Change-Id: Ib15bf621b3d56568377641574cf42bb6dee6bffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 15:43:51 +00:00
Bonian Chen
63cfa3a674
[automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256
-s ours am: f10535cf6c
-s ours
...
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2317315
Change-Id: I62dd0bbfe49f8add5ca1c5234f31890efef190a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 15:43:49 +00:00
Treehugger Robot
b02050cbe1
[automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435
-s ours
...
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2317315
Change-Id: I6c76e1df48a75f49d99beb22eaff8109de6cc676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 15:15:31 +00:00
Bonian Chen
f10535cf6c
[automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256
-s ours
...
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2317315
Change-Id: I4cdcaa6ec1485f6f592a5633d317d3329d1cd632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 15:15:29 +00:00
Treehugger Robot
6685055435
Merge "[Settings][port] configuration for hidding SIM related UI"
2022-11-25 14:42:14 +00:00
SongFerng Wang
19518a7c83
Merge "The page id SettingsEnums.DIALOG_PREFERRED_SIM_PICKER is duplicated"
2022-11-25 14:25:58 +00:00
Bonian Chen
b644c54256
[Settings][port] configuration for hidding SIM related UI
...
Add overriable configuration for hidding SIM related UI.
Bug: 240515161
Test: test cases and local testing
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Merged-In: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
Change-Id: I67166b0db08635ee2bc01a8208f96126b64fd0a7
2022-11-25 13:54:35 +00:00
TreeHugger Robot
8b6abe047c
Merge "Apply new metrics to make App info dialogs have their own unique id"
2022-11-25 09:59:08 +00:00
Zhenwei Chen
41ce87729e
Fix LoaderCallback.onLoadFinished uncalled issue
...
When two loaders started almost at the same time,
it is possible onLoadFinished is never called.
Bug: 256523472
Test: Unit tests passed and manual test on device
Change-Id: I41a041d5878f9930db44775408380d0d4588faba
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
2022-11-25 16:01:04 +08:00
Vincent Wang
bdebd9f346
Add test for FingerprintEnrollment
...
Bug: 259504907
Test: atest SettingsUITests:FingerprintEnrollmentTest
Change-Id: If7a8a7124b685f4517880517afc7f17b07c0ad29
2022-11-25 15:01:48 +08:00
Pasty Chang
db61f1fc4c
Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev am: 3bde8a502e
am: 0b61859b64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20486990
Change-Id: I0b200617a7d83c24845da112f7f21f8b4f426b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 03:17:05 +00:00
Pasty Chang
0b61859b64
Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev am: 3bde8a502e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20486990
Change-Id: I9c5eacac486ea9e9a19660876490c1e74adc3da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 02:42:04 +00:00
Pasty Chang
3bde8a502e
Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev
2022-11-25 02:15:17 +00:00
Tetiana Meronyk
db6b029287
Remove system user from displaying in Storage Settings in HSUM
...
Bug: 259525664
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.deviceinfo.storage.NonCurrentUserControllerTest"
Change-Id: I9425a9becdb89588da4a917c0ba9401d6b354238
2022-11-25 00:24:30 +00:00
Yanting Yang
afbf2430af
Apply new metrics to make App info dialogs have their own unique id
...
- Apply SettingsEnums.DIALOG_BASE_APP_INFO_ACTION
- Apply SettingsEnums.DIALOG_INSTANT_APP_INFO_ACTION
Bug: 260072013
Test: make build
Change-Id: Ie1daecbcb4e03802ca31219d570b8e9fa674f371
2022-11-24 19:07:13 +00:00
Bonian Chen
7d507964e6
Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44
am: a0baef444d
am: 5d2afa168a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406
Change-Id: Ib998f0407156c5f16aed4b0a977ec8f85e048560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 15:46:37 +00:00
SongFerngWang
eece0b0420
The page id SettingsEnums.DIALOG_PREFERRED_SIM_PICKER is duplicated
...
Bug: 260072136
Test: build pass
Change-Id: I683c3227d3138dea8699d7dd5a130cb02b1ceff8
2022-11-24 23:17:21 +08:00
Bonian Chen
5d2afa168a
Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44
am: a0baef444d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406
Change-Id: I5f54b27ea703417acc13421fb4810df5b79a5cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 15:10:40 +00:00
Bonian Chen
a0baef444d
Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406
Change-Id: I2f18c417aeae58959902c61946ebc44391445411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 14:42:02 +00:00
Bonian Chen
d1e0b46a44
Merge "[Settings] Enable ActivityResultLauncher for keyguard"
2022-11-24 14:25:17 +00:00
Arc Wang
d132199429
Add page id enum for storage settings
...
- Add SettingsEnums.SETTINGS_STORAGE_CATEGORY_WORK
Bug: 260052338
Test: compilation
Change-Id: Ib3e30410c2e2f6367be8ac26cd63cdf16caef70e
2022-11-24 14:27:04 +08:00
Bonian Chen
845426e9e5
Merge "[Settings] Code refactor" am: b60b759dac
am: 61ed679576
am: e9e7cdf914
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309
Change-Id: I05dcb1af5e6d6e515ebaa81641df57883a88c36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 05:16:23 +00:00
Bonian Chen
e9e7cdf914
Merge "[Settings] Code refactor" am: b60b759dac
am: 61ed679576
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309
Change-Id: I138c4c8108dee8c1c492e6909881c689dc66be63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 04:40:53 +00:00
Bonian Chen
61ed679576
Merge "[Settings] Code refactor" am: b60b759dac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309
Change-Id: I8e0331d1f3fccc71a33a81fbb7d98956bce1be27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 04:10:59 +00:00
Bonian Chen
b60b759dac
Merge "[Settings] Code refactor"
2022-11-24 03:44:13 +00:00
Bill Yi
db1885ce15
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 49caa49dfc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546215
Change-Id: If93361cf491145ee5ca63345fd417fa5a468e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 02:04:13 +00:00
Bill Yi
49caa49dfc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-11-24 01:38:09 +00:00
Bill Yi
2e99220f61
Merge changes from topic "tc_change_22112223_16"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c84754ed13
Import translations. DO NOT MERGE ANYWHERE
2022-11-24 01:38:09 +00:00
Bill Yi
dd1679a059
Merge changes from topic "tc_change_22112223_16"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 831453a97c
Import translations. DO NOT MERGE ANYWHERE
2022-11-24 01:38:09 +00:00
TreeHugger Robot
1afc1eb345
[automerger skipped] Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c168
am: 1793a5a322
-s ours
...
am skip reason: Merged-In Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a with SHA-1 728a59199b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20519152
Change-Id: Ia124bd7b28355274ae89afd14b6aa668a3d34bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 01:07:18 +00:00
TreeHugger Robot
1793a5a322
Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c168
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20519152
Change-Id: I979fff8af4a4da75a0fd0d173a6561032a78895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 00:30:00 +00:00
TreeHugger Robot
21923a767f
Merge "[MTE] Use separate SettingsEnum value for dialog."
2022-11-24 00:18:44 +00:00
TreeHugger Robot
dc4b54c168
Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev
2022-11-24 00:01:22 +00:00
Dmitry Dementyev
a52ba15823
Show account name as a single line string.
...
Bug: 213905884
Test: manual
Change-Id: I608dad01cb6bfd94a5b4318169cc50f9790a3fb2
2022-11-23 21:54:10 +00:00
Dmitry Dementyev
254ea79565
Show account name as a single line string.
...
Bug: 213905884
Test: manual
Change-Id: I608dad01cb6bfd94a5b4318169cc50f9790a3fb2
2022-11-23 13:33:17 -08:00
TreeHugger Robot
8d4a48e1d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 691196e900
-s ours am: 00e2fe73cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546313
Change-Id: I65b38008e474a830a37be502bcdd06f45fa210a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:36:41 +00:00
Bill Yi
72d9179383
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9a4f35a74
-s ours am: ebb7230ac0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546313
Change-Id: If5f3deceadfb66fde38e0c204d68bf688e91bfd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:36:33 +00:00
TreeHugger Robot
9e110eb6b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 43e8a4480b
-s ours am: 8dab2de988
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546310
Change-Id: I0f644a2e0801e5ab9278f242b7607e92f0c38824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:36:18 +00:00
Bill Yi
6489f5e4f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebc354ab68
-s ours am: 573755927f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546310
Change-Id: I4084613fb60ad90de32e606a56ea132e7af147fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:35:56 +00:00
TreeHugger Robot
00e2fe73cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 691196e900
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546313
Change-Id: I36084e6cb3425afdf774b5e2e2dc0cca945c0c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 20:14:47 +00:00