Commit Graph

119070 Commits

Author SHA1 Message Date
TreeHugger Robot
2de94ad9e7 Merge "Fix FingerprintEnrollIntroFragment buttons" 2022-11-23 14:31:09 +00:00
András Kurucz
0fa99226e1 Allow to block/unblock Conversation Notifications from Settings
The user can end up in a state where the Channel of a Conversation is
blocked (has an importance of 0).
Currently there was no way to unblock it, because we didn't allow it from
the Settings. Therefore now the option to block/unblock is added to the
Conversation Settings page.

Fixes: 255062535
Test: Block/Unblock a Conversation from Settings
Test: Mark a notification blocked and conversation by clicking the “Show
notifications” toggle and the “This is a conversation” button at once.
Now unblock it from the Settings.

Change-Id: I06778d259155d87d6af4bdb7013cd3b6c9a2e5ee
2022-11-23 13:24:36 +00:00
Bonian Chen
e76bcc5388 [Settings] Code refactor
Wrap reset options into an Object, for better supporting

Bug: 260034791
Test: auto testing
Change-Id: I98cc12440414077b600bba0b5598c887608419cc
2022-11-23 12:52:55 +00:00
Bonian Chen
b5921fade9 [Settings] Enable ActivityResultLauncher for keyguard
Enable the support of ActivityResultLauncher for keyguard.

Bug: 260034791
Test: local
Change-Id: I0643241d7b79ba0ac4cd2314a126f33eb6557cc0
2022-11-23 12:48:34 +00:00
Bonian Chen
c2776e0e67 [Settings] Add some log
Add log to support debugging.

Bug: 259611847
Test: auto test
Change-Id: Ic7ea410604794e3b9caa8ab955e1406578a25425
2022-11-23 12:36:17 +00:00
Milton Wu
505be79cc5 Fix FingerprintEnrollIntroFragment buttons
1. Fix FingerprintEnrollIntroFragment button status not sync after
   rotation.
2. Finetune code orders in FingerprintEnrollmentActivity.onCreate(),
3. Refine some API names and java doc

Bug: 260205364
Test: atest AutoCredentialViewModelTest
            FingerprintEnrollIntroViewModelTest
Test: Manually test rotation with different display size
Change-Id: Ib992e10a1c90e3bbac6cf73114df4e96b5ab0a03
2022-11-23 20:15:04 +08:00
TreeHugger Robot
8aa8d6314f Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev am: fa6f92aa74 am: 2d6e3bb5a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20549489

Change-Id: I0b3af1b467866320226a02ff37f51d0616d69837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 10:34:44 +00:00
TreeHugger Robot
2d6e3bb5a7 Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev am: fa6f92aa74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20549489

Change-Id: I8cc3a1d353b86fbf84e40f1d4932955c9a72aa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 09:58:15 +00:00
TreeHugger Robot
fa6f92aa74 Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev 2022-11-23 09:19:27 +00:00
Bonian Chen
0f629e4e81 [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours am: d38d75bc0c -s ours am: 743baac904 -s ours
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311476

Change-Id: I7a0fc88825c1acd17d5e4c014e6365204bf6ea8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 08:34:04 +00:00
Bonian Chen
9318a84c39 [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours am: 32884e3e97 -s ours am: 4218f2defd -s ours
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311476

Change-Id: Ic5c35262baeb399c80deb0b70f33823cb42d220e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 08:33:57 +00:00
TreeHugger Robot
926df61437 Merge "Keep "Resetting your internet" when screen rotates" 2022-11-23 08:18:03 +00:00
Bonian Chen
743baac904 [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours am: d38d75bc0c -s ours
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311476

Change-Id: I27cc4bb4ae1175a400e7943759411793c2584b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 07:57:33 +00:00
Bonian Chen
4218f2defd [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours am: 32884e3e97 -s ours
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311476

Change-Id: I329962649039fed9936a353b52f24eed0bd6d538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 07:57:31 +00:00
Angela Wang
e7a4b1f13d Shows LE audio hearing aid device in a11y settings page (3/3)
Shows connected hearing aid in a11y settings page whether it's ASHA hearing aid or LE audio hearing aid. Makes sure preference summary is updated as expected when BluetoothHapClient profile connects or disconnects.

LE audio hearing aid will be a CSIP set. According to the CSIP spec, we will show the device is active without side information if there is only one device in the CSIP set and show the device is active left and right if both side of hearing aids are in the CSIP set.

Bug: 249235823
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidPairingDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsRelatedToolsControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Ifd66cbd81481a1eb94613d89dfd8df16b8c43ae8
2022-11-23 07:50:51 +00:00
TreeHugger Robot
0f0c45c479 Merge "Align same wording style with Settings main switch" 2022-11-23 07:50:04 +00:00
Kuan Wang
5e79362920 Merge "Clean up unused files for Battery Usage in SettingsGoogle, which have been moved into Settings." 2022-11-23 07:36:42 +00:00
Bonian Chen
d38d75bc0c [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311476

Change-Id: I9b43b0167ce54a8d41dc34850535708eaa60f859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 07:29:09 +00:00
Bonian Chen
32884e3e97 [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311476

Change-Id: I2286c88e39b0111bf804fb64d658ba6ea064224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 07:29:07 +00:00
SongFerng Wang
d6189fab1c Merge "Remove "Backup Calling" button from Settings UI" 2022-11-23 07:22:08 +00:00
Bill Yi
402fd0e56f [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c84754ed13
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546215

Change-Id: I69118606ffe9fb3dd01b4b27d331b6cd39de516f
2022-11-23 07:08:28 +00:00
Bill Yi
28a33ffdc5 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 831453a97c
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20546214

Change-Id: Ie2c5f6154bdd13bde4fc34c5031e0fce577ac5e2
2022-11-23 07:08:11 +00:00
Bonian Chen
ea537afa54 Merge "[Settings] Additional route for dismiss activity dialog" 2022-11-23 07:02:20 +00:00
Arc Wang
f6d712c7b7 Remove isSticky true for SplitPlaceholderRule
SplitPlaceholderRule#isSticky determines whether the placeholder
will show on top in a smaller window size after it first appeared
in a split with sufficient minimum width.

This change will show Settings homepage while users rotate
device to portrait mode and show Settings 1-pane UI.

Bug: 256115335
Test: manual visual
      1. Set font size and display size to large.
      2. Launch Setting app in landscape and rotate to portrait.
Change-Id: Ie955f8b8db3bbe42dba6300608774582ef150590
2022-11-23 14:44:53 +08:00
Jing Ji
249283ffa0 Add a developer option to disable app child process restrictions
Bug: 205156966
Test: atest PhantomProcessPreferenceControllerTest
Change-Id: I87fd78b3dc7dea069823de6bef0bd7fe20d985ad
2022-11-22 22:22:47 -08:00
Arc Wang
08d0f0439c Add page id enum for storage settings
- Add SettingsEnums.PRIVATE_VOLUME_FORGET
- Add SettingsEnums.PRIVATE_VOLUME_FORMAT
- Add SettingsEnums.PRIVATE_VOLUME_UNMOUNT
- Add SettingsEnums.PUBLIC_VOLUME_SETTINGS

Bug: 260051818
Test: compilation
Change-Id: If6188eb1de1e17702007d9d87c52b811972d5f7d
2022-11-23 06:22:28 +00:00
“Ankita
4c2ef22a81 Show apps from user and all of its profiles in recents category.
Previously only personal and work profile apps were displayed.

Bug: 259627902
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RecentAppStatsMixinTest
Change-Id: Id975534343dab3c816a6a18d53ba639a74ff81b0
2022-11-23 06:13:24 +00:00
Zoey Chen
0514e9a96a Merge "[Settings] Apply the SettingsDataService to the SIM page, MobileDataPreferenceController" 2022-11-23 05:07:16 +00:00
TreeHugger Robot
167e9b2a01 Merge "Add FUELGAUGE_BATTERY_SAVER_SCHEDULE for saver schedule page metric" 2022-11-23 04:42:06 +00:00
YK Hung
f7b7c13c1b [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours am: ab48f9ba47 -s ours am: 7336fbfcc8 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I58a96df6c470fe6a0b6d35b1ad975c4f0cd49ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 03:36:20 +00:00
Cole Faust
40da8ff233 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours am: a0dd446e61 -s ours am: a5572aff15 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I9c0a4b8a817eda318e5e66bc62c0671d9a9b40bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 03:36:16 +00:00
YK Hung
7336fbfcc8 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours am: ab48f9ba47 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I0b3a6d8f77a24cc8536503e1f1bedbb35ad54130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 03:00:26 +00:00
Cole Faust
a5572aff15 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours am: a0dd446e61 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: Ie609432ec4075f105f4a89b0702d03d78ef9db17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 03:00:18 +00:00
Sunny Shao
b189b04c61 Add page id enum of dialog under Open by default page
- Add SettingsEnums.PROGRESS_DIALOG
- Add SettingsEnums.SUPPORTED_LINKS_DIALOG

Fixes: 260073786
Fixes: 260073725
Test: compilation
Change-Id: I060025c72a4c03dde1f9be5fa3215fceb98779cd
2022-11-23 10:35:47 +08:00
YK Hung
ab48f9ba47 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I1c3342037844ada6a10e6b822940d0541ec4ce19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 02:32:00 +00:00
Cole Faust
a0dd446e61 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308772

Change-Id: I8b1ab784d4aca65eec06c6bf80817c9d043f0acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 02:31:59 +00:00
Kuan Wang
24f0f2c2da Clean up unused files for Battery Usage in SettingsGoogle, which have
been moved into Settings.

Test: make RunSettingsRoboTests
Bug: 256123455
Change-Id: I21fe684b9b3a2a748c5d10353e68e15ddf281838
2022-11-23 02:22:24 +00:00
YK Hung
3836a8a8de Merge "Fix errorprone warnings that should be errors" 2022-11-23 02:07:10 +00:00
Milton Wu
34c2d48973 Merge "Fix FingerprintEnrollmentActivity rotaiton crash" 2022-11-23 02:05:24 +00:00
ykhung
5cfec67572 Add FUELGAUGE_BATTERY_SAVER_SCHEDULE for saver schedule page metric
Bug: 260074438
Test: make test RunSettingsRoboTests
Change-Id: Ib7e55b6638d1b10a47cbf25f5dbbb40b3f4962f2
2022-11-23 10:01:26 +08:00
Bill Yi
c9a4f35a74 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9d5dceeb79a553eace466c50494f0e670bcbf28a
2022-11-22 15:59:54 -08:00
Bill Yi
ebc354ab68 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib53e903156f20220886651eca3ee1b7958cce2cc
2022-11-22 15:53:52 -08:00
Bill Yi
c84754ed13 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icd56c46e4aa43edfacfcb0f295efc92764a31d64
2022-11-22 15:50:29 -08:00
Bill Yi
831453a97c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ide78fe6e6e639fc932f82c4a03864b77ebf8695e
2022-11-22 15:47:37 -08:00
Steve Elliott
66284b5528 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623 am: 81fc1b0b4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I510fcf15b561e4f89df2b1b69ad74ca0350c1426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 23:40:10 +00:00
Steve Elliott
81fc1b0b4d Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I9cd33ea6d02cf1243034a399162dfffcd0fd8f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 23:05:49 +00:00
Steve Elliott
fece948623 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev 2022-11-22 22:50:10 +00:00
Florian Mayer
698b805397 [MTE] Use separate SettingsEnum value for dialog.
Bug: 260060334
Change-Id: Id2cf2d2a0eb444a82c8551a62c199a9e80fd2776
2022-11-22 12:45:57 -08:00
Hao Dong
b9dc6dedfd [automerger skipped] Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857ec am: a538195c3c -s ours
am skip reason: Merged-In I193c7b7c49f884541bd5d8282d15bf69e46f3392 with SHA-1 b4000fb226 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20518779

Change-Id: I6c27aea363c926b9769fbe6495a3eaeddd0c63d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 18:20:39 +00:00
Florian Mayer
1dedb09404 Merge "Remove periods from description strings" 2022-11-22 18:04:53 +00:00