Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,649 Commits 1 Branch 0 Tags
cadc70a0db2161f46c8dc18d7b65b96409214c33
Commit Graph

48916 Commits

Author SHA1 Message Date
Joe Bolinger
cadc70a0db Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383edf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831

Change-Id: Ie403cfa86823a7d53fab020cd1019cb9d83a2698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 04:23:18 +00:00
Austin Delgado
a73cee24d4 Fix talkback not announcing requirement in ChooseLock 
Fix: 281955512
Test: Manual, verify talkback reads out password requirement on 17th digit
Change-Id: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd
Merged-In: Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd
 2023-08-21 20:35:39 +00:00
Anvesh Renikindi
5a6d7745d0 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp am: 942e44c0b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24446787

Change-Id: If307c1d7545d2528aa271a98fc8f236b0d5570bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 17:14:29 +00:00
Anvesh Renikindi
942e44c0b8 Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into udc-dev-plus-aosp 2023-08-17 16:49:52 +00:00
Treehugger Robot
fc02a337f8 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a am: 47f8568209 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: I32983b0b8ef21c1630b475ec02bd65c8166699b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:56:33 +00:00
Treehugger Robot
47f8568209 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: Ic7d2922b78791b84fd7caaee33e91a2ea35acc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:11:01 +00:00
Treehugger Robot
565161fb1a Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: If3767eedff3437224ea7a3864bd48496f392f50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 21:27:43 +00:00
Andreas Miko
05514d0f4d Change nullability of inheriting function of PinPrivacyPreferenceController 
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
(cherry picked from commit a7d7eb9a16)
(cherry picked from commit 4ca80e6013)
 2023-08-16 15:45:00 +00:00
Colin Cross
918e687c93 Fix kotlin nullable errors in Settings am: 753c96133a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423375

Change-Id: I3b1e2e72e98bf2d0bdaaec2c247d2bd9ddfa872e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 03:39:25 +00:00
Colin Cross
753c96133a Fix kotlin nullable errors in Settings 
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
 2023-08-14 12:29:53 -07:00
DingFei Song
07f2e22d26 Use ArrayMap to cache active subscriptions 
Because we use ArrayMap to deduplicate active subscriptions.
Caching also needs to use ArrayMap, otherwise it will cause
index inconsistency.

Bug: 295124402

Change-Id: I4fa0efd1d35855d0ea7723ad6134213ab384cd4d
Signed-off-by: DingFei Song <v-dingfeisong@xiaomi.corp-partner.google.com>
 2023-08-11 10:47:48 +08:00
Eric Biggers
99abeaeec1 Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c am: fdf07d6c35 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640

Change-Id: Ic208bc0ed3d9ff73a77fed35bc4cdc501f41e149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 02:22:36 +00:00
Eric Biggers
47e19db82e Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d am: a386c78678 am: ecca6508da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639

Change-Id: I5dbb93387c02bff45b4fc572f8e2a654837a4fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 02:22:33 +00:00
Eric Biggers
fdf07d6c35 Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640

Change-Id: Ife2292b6bfa6c032701c1f44e4f40e969d83e929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 01:37:55 +00:00
Eric Biggers
ecca6508da Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d am: a386c78678 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639

Change-Id: I0ee235dd800b5bc7ab5e2ad2b4199500b69ad240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 01:37:49 +00:00
Eric Biggers
71814b355c Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700640

Change-Id: I3e589ba397243133a203ab3147bffea11f7158bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 00:38:25 +00:00
Eric Biggers
a386c78678 Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639

Change-Id: I8881a8521ca9e9748bb827b7d37a1dbabff1329e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 00:38:18 +00:00
Eric Biggers
6cb2d5a795 ChooseLockPattern: remove redundant setting of visible pattern default 
Remove the code that set LOCK_PATTERN_VISIBLE to true the first time a
pattern was set, since LOCK_PATTERN_VISIBLE now defaults to true when
unset (ag/22912136).  The explicit defaulting to true was only needed
before because the low-level default value was wrong.

Bug: 270013005
Test: Set a pattern.  Verified that Keyguard uses visible pattern.
      Disabled the "Make pattern visible" option in Settings.  Verified
      that Keyguard doesn't use visible pattern.
Change-Id: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
Merged-In: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
(cherry picked from commit 6c3de30086)
 2023-08-09 04:03:18 +00:00
Eric Biggers
08e6612a3d Stop calling LockPatternUtils.setVisiblePasswordEnabled() 
Since the removal of support for Full Disk Encryption (FDE) in favor of
File Based Encryption (FBE), this method has been a no-op.

Bug: 208476087
Test: atest ShowPasswordPreferenceControllerTest.  Note,
      isAvailable_whenNotVisible_isFalse fails both before and after.
Change-Id: Ifb8fc93757366240cf37e4b9a600c2034302919e
Merged-In: Ifb8fc93757366240cf37e4b9a600c2034302919e
(cherry picked from commit bcee8ce1af)
 2023-08-09 04:02:54 +00:00
Justin McClain
6d5ae56ab7 Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 am: 63256b458d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I3d616f015890d6ec77efc2558aa780553424dcfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 20:30:49 +00:00
Justin McClain
63256b458d Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I9ae167fda396f42065c30c680bdc66806a02f342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 19:22:29 +00:00
Justin McClain
01dbc55db8 Merge "Adding owners file." into main am: 3bf19b75fb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I2f3b523f8ac1988ba51a9cc77b5868ff8f9e0ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 18:19:22 +00:00
Austin Delgado
0abddc88bc Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I706d8f22283ead587622a6d0fd4907a7b9e93f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 23:05:19 +00:00
Austin Delgado
c6e7b93f28 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev 2023-08-01 22:13:34 +00:00
Justin McClain
5f8aeeb9ef Adding owners file. 
Test: m
Change-Id: I0b32a9bc0e9be65b3d2ff0ac07d79baa05305205
 2023-08-01 13:44:22 +00:00
Austin Delgado
035b661ea4 Announce requirements when setting PIN/Pass 
Test: Manual, verify requirement is read
Fixes: 281955512
Change-Id: I6d963d545c68c4ec891d9ad8a7da8c0a0f6e9d6b
 2023-07-31 17:50:39 -07:00
Treehugger Robot
ff78df4b72 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: Ie247ffcc6ec787912e50474ec1d51744e6dfc5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 06:38:47 +00:00
Treehugger Robot
3d47657593 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: If5c4c47dd5d1b05635e8d5102e52a58f5442a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:31:45 +00:00
Treehugger Robot
9a44907d9e Merge "Match APN types with ignoring the case" into main am: 720fd136ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: I502a8c1c156c26bb68f73afc4a2c5d438aef5dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:47:15 +00:00
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
4f21f99c6d Merge "Correct used size of Storage Settings." into udc-d1-dev am: d86ec6652a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898724

Change-Id: I837d4842ba1031e5270d54af8b29955ead10fb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 02:07:33 +00:00
Treehugger Robot
d86ec6652a Merge "Correct used size of Storage Settings." into udc-d1-dev 2023-07-26 01:47:59 +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
b48dfbbe86 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: Ia55ca6e477494e1e0ca3773c7a4df63ca2d59d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 21:04:58 +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
Wenhui Yang
eb94624bcd Update learn more string for udfps fp settings am: c6c9d74f06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156551

Change-Id: I92bc5389ab6346cbedcce6e76135067ec3a201a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-22 00:51:46 +00:00
Hideki Ishii
8bce735fa0 Match APN types with ignoring the case 
Currently APN types which are set on ApnEditor are compared with the
types which are configured with read_only_apn_types_string_array in a
case-sensitive manner. So upper case types such as "DUN" or "IMS" can be
set if read_only_apn_types_string_array is configured as "dun" or "ims."
Then the APN with types such as "DUN" or "IMS" can be added and may be
used for the network connection unintentionally.

This patch compares APN types with ignoring the case on ApnEditor to
prevent the problem above.

Bug: 200194310
Test: Manual test passed
Change-Id: I0f68bf470699df388855ec7277c0cfc24a2c30ba
 2023-07-21 15:49:02 +09:00
Wenhui Yang
c6c9d74f06 Update learn more string for udfps fp settings 
Update the learn more message for udfps fingerprint unlock to make it
consistent with sdfps.

Fixes: 289167628
Test: manual (see bug)
Change-Id: Iac6edb1c176dab462c91e1bf6236dfe4d0988693
 2023-07-21 02:36:24 +00:00
Ken Lin
face5b6c2a Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev am: a6f2464e8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923

Change-Id: I5554e3263baf46c64ba2286a80e5cb83da5d4098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 05:08:37 +00:00
Ken Lin
c655c82ada Settings crashed when changing the Screen Resolution 
Check if index is out of bound

Bug: 288256336
Test: Change to Full resolution, set Smallest width to 426 dp, then
switch to High resolution
Test: atest ScreenResolutionFragmentTest

Change-Id: Ida4128e76e097050b01deae91c9d669e58ab9e8f
 2023-07-18 02:30:09 +00:00
Bill Yi
05c15f8e73 Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE 
Merged-In: I2d14107a37340b8b34ae71c67f7f705a272324b9
I2d14107a37340b8b34ae71c67f7f705a272324b9
Merged-In: I302a25ff6f386b4b533354fcb841abd01aa1d837
I302a25ff6f386b4b533354fcb841abd01aa1d837
Merged-In: Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c
Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c

Change-Id: Ie7d523720aff6d3ac1879130df097474e417d215
 2023-07-11 15:30:02 -07: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