Commit Graph

19309 Commits

Author SHA1 Message Date
Wenhui Yang
16dc3ed748 Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I7292307f085c72568e2220a718268b487dd73345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 03:16:57 +00:00
Wenhui Yang
5239911c6b Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev 2023-07-26 02:44:08 +00:00
Treehugger Robot
731c2462bc Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: I699b21dd28e73c18945b4fecc6f3318b1cded128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:49:30 +00:00
Treehugger Robot
57b00e28ea Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:59:46 +00:00
Wenhui Yang
d26f18f727 Revert "Fix rotate device at face unlock detailed page, device will display"
This reverts commit 2ca753bd06.

Reason for revert: Fix b/289173795

Change-Id: Ieaabe550bcbaad21a2373f3c5c103c68739d45dc
2023-07-25 20:31:36 +00:00
Chaohui Wang
47803f6b10 Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I159db196a31270e20a213796e8236eb9808d418a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 08:30:00 +00:00
Chaohui Wang
fe38ff963a Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev 2023-07-11 07:50:49 +00:00
SongFerng Wang
96c2da1340 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Iabad339cd438114562b16a495f2e9c15249c38b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 05:22:21 +00:00
SongFerng Wang
717ce2b91f Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev 2023-07-11 04:55:18 +00:00
Chaohui Wang
f3d6684e14 Fix crash when call getMobileTemplate am: 9132535e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 08:12:07 +00:00
Chaohui Wang
9132535e5e Fix crash when call getMobileTemplate
There are 2 versions of getMobileTemplate.

The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.

Change back to fix the issue.

Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
2023-07-10 14:20:07 +08:00
Chaohui Wang
590b4e7af8 [Regulatory Labels] Load labels from overlays
When config_regulatory_info_overlay_package_name is configured, load
regulatory labels directly from overlay package.

Also fix RegulatoryInfoDisplayActivity missing dialog theme.

Bug: 283170651
Test: unit test
Test: manual - check regulatory labels
Change-Id: Ia1f6848abe0da9facf34f47abab09e88d57e74d6
2023-07-07 14:52:26 +00:00
Weng Su
5a17d39db7 Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e18e7414c674a1c5bc69961c03499849b4aefd2)
Merged-In: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-07 12:11:33 +00:00
SongFerngWang
d94ac12190 To fix waiting too long issue when psim -> esim
if the user swithes slot from psim to esim, then the settings
need to wait the simSlotMapping completed and it has a timer to avoid
UI stay here too long.

Since the framework did not sned the carrier config changed with vaild
subId in MEP + psim->esim case, it cause the settings does not know the
simSlotMapping completed and it stay here until timeout.

For MEP case, changing this condition as SimSlotStatusChanged

Bug: 273813956
Test: atest UiccSlotUtilTest
Change-Id: Ic09dbcb3629fe13770f3ad301c0a396d6745969f
2023-07-07 10:22:49 +00:00
Michael Mikhail
1db4bc3676 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 15:51:23 +00:00
Michael Mikhail
83c13d6563 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Chaohui Wang
eb8948e309 Fix DataUsagePreferenceController ANR am: d42cc8e5e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 08:59:57 +00:00
Chaohui Wang
d42cc8e5e2 Fix DataUsagePreferenceController ANR
Offload calculation work from main thread to fix.

Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
2023-07-04 12:06:53 +08:00
Hao Dong
b911186928 Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033

Change-Id: Icf5479eba2dd94fa40c41cdea7ae4d86e9f58a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:07:43 +00:00
Hao Dong
55ec9b88d6 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605

Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:06:58 +00:00
Hao Dong
04b1932b25 Merge "Fix pattern rotation header text." into udc-d1-dev 2023-06-29 23:52:00 +00:00
Hao Dong
72f2058d3e Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev 2023-06-29 23:51:50 +00:00
Matías Hernández
9feb898da7 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:35:52 +00:00
Matías Hernández
aaddfd88e9 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 17:14:55 +00:00
Hao Dong
7b99d92464 Fix pattern rotation header text.
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
Merged-In: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-27 17:50:15 +00:00
Hao Dong
2ca3f3232c Fix Fingerprint enrollment UI when display size is largest.
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java

Test: manual test - 1. Set system display and font size largest
	            2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
Merged-In: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-06-27 17:48:16 +00:00
Michael Mikhail
499f965c1c Add content description to volume title in settings.
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.

Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-06-26 23:35:39 +00:00
Hao Dong
93bcf8122c Wait for systemui udfps overlay ready to show settings udfps enroll view. am: be823bc598
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23814463

Change-Id: I0b509bd402107442b93f6855f34389dfa61c59e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:26:53 +00:00
Hao Dong
be823bc598 Wait for systemui udfps overlay ready to show settings udfps enroll view.
Previously, we show settings's udfps enroll animation view (the fingerprint icon and progress view) once the FingerprintEnrollEnrolling is shown.
However, touch events have to wait for systemui's udfps overlay to be valid. This CL lets settings's udfps enroll view wait for systemui's overlay.
1. Sets udfps enroll animation view's default visibility Gone.
2. Propagates FingerprintManager#onUdfpsOverlayShown to
   FingerprintEnrollEnrolling and when it's called, set the enroll view
   visible.

Besides, this CL renames onPointerDown() and onPointerUp() with Udfps.

Bug: 280718879
Test: atest FingerprintEnrollEnrollingTest
Change-Id: Ieed3e74c182828918785edcacb021f19a3665f2a
2023-06-26 20:21:05 +00:00
Matías Hernández
027f0a46ae Settings: don't try to allow NLSes with too-long component names
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).

Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-21 17:02:32 +02:00
TreeHugger Robot
87f7101866 Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I8ca64005b6dcdc623771de162eb6d68f7fb65808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 04:58:20 +00:00
Weng Su
7bd6646e5f Remove Wi-Fi hotspot from settings search for non-admin users
- Don't use ViewModel if the settings UI is restricted

Bug: 284931681
Test: manual test
atest -c WifiTetherSettingsTest

Change-Id: I3ae23b01b3be821c3560552b39cbd83ab51b2095
2023-06-21 06:58:18 +08:00
Treehugger Robot
c88e678aa9 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: c14daa817b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I08ed49fba3fb42bde7c8836666476091cdd1c6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:32:02 +00:00
Treehugger Robot
c14daa817b Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I1e96376f6aec9cce89f71117474bace2d1364505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:06:30 +00:00
Treehugger Robot
44fddb456e Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I2fe19557e53756a2e61071ae530f89756cb32eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:05:57 +00:00
Treehugger Robot
08366227b5 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev 2023-06-15 11:18:51 +00:00
Treehugger Robot
d4aa1b65a5 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I159952074306255db4397de180ee4b49eb78613b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 03:53:50 +00:00
Treehugger Robot
8182348d5c Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev 2023-06-15 03:02:41 +00:00
Matías Hernández
4c941d3a97 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: e8cfc9cb3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I1a2c78f743615bdc351061846fd65f4e23777c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 17:21:49 +00:00
Matías Hernández
33e5518af1 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: Ie91f13e1b27753177e9bd7f7b88e9f2821cdada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 16:38:43 +00:00
Matías Hernández
e8cfc9cb3d Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: Ic1d0d1cda4e35705215fe4268974f304350cfbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 16:37:43 +00:00
Matías Hernández
dcbe38baa9 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I69d2ef43afb54ce3b9d141d4f676b688dd1c5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 15:52:58 +00:00
Matías Hernández
2b1faa0aea Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 15:09:53 +00:00
Matías Hernández
0aa241be99 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 13:42:07 +00:00
Matías Hernández
50df60c93c Don't hide approved NLSes in Settings am: ff255c6eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 12:57:15 +00:00
Treehugger Robot
03b39bc5d3 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725

Change-Id: I6e8bb778a0c9a7e45965bebe6605bac76915aad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 12:28:49 +00:00
Treehugger Robot
3494d09de4 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev 2023-06-14 12:00:21 +00:00
Weng Su
6a20a8c5df Fix Hotspot & tethering settings crash
- Cannot omit addPreferencesFromResource even if UI is restricted

Bug: 287172382
Test: manual test
atest -c WifiTetherSettingsTest

Change-Id: I1f5c0215a635fddefe7eaa20c1d765634b505121
2023-06-14 18:59:30 +08:00