Commit Graph

140296 Commits

Author SHA1 Message Date
Weng Su
254ba087c2 [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG

- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG

Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
         SettingsUnitTests:WifiDppConfiguratorActivityTest

Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 07:50:24 +00:00
Chaohui Wang
51a4bea7d9 Use SpaDialogWindowTypeActivity for WEP dialog
TODO: Set different window type when called from Quick Settings.

Bug: 332643450
Test: am start -n com.android.settings/.network.WepNetworkDialogActivity
Change-Id: Ie888e7cc116234199316b030fb5f35dea6dbb3ac
2024-04-03 15:26:26 +08:00
Samuel Huang
854785bebb [automerger skipped] Merge "Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook" into 24D1-dev am: 9c5ce0172f -s ours
am skip reason: Merged-In I117dab50b8157e2f81de7b1ff6998c45fb84c734 with SHA-1 06562e0f35 is already in history

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

Change-Id: I869538899dd5271eb93f7a75dfffa3fa5bc7d38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 05:05:50 +00:00
Samuel Huang
a06c66622a [automerger skipped] Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook am: c6e13c10c4 -s ours
am skip reason: Merged-In I117dab50b8157e2f81de7b1ff6998c45fb84c734 with SHA-1 06562e0f35 is already in history

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

Change-Id: I3e0be83aa9e0d72ca5b41713030f91e9dde3d6e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 05:05:44 +00:00
Les Lee
1635951de2 wifi: Using framework uri parsing
Bug: 298669190
Test: Manual test. Qr code sacnning works normally.
Change-Id: I8e6138971ae6798b42db32930f80e9113a8c0223
2024-04-03 04:59:22 +00:00
Samuel Huang
9c5ce0172f Merge "Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook" into 24D1-dev 2024-04-03 04:48:24 +00:00
Weng Su
0ea027a71c [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG

- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG

Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
         SettingsUnitTests:WifiDppConfiguratorActivityTest

Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
Merged-In: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 03:52:07 +00:00
Chaohui Wang
43ce1c4abf Merge "Correct the data usage warning" into main 2024-04-03 03:38:07 +00:00
Jason Chang
edb0ff11e1 Merge "Fix face unlock setup page is abnormal" into 24D1-dev am: d245c1108a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784347

Change-Id: Iaa927a8b3f6df29d634bfb6baacdb96aeb415899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 03:25:00 +00:00
Jason Chang
d245c1108a Merge "Fix face unlock setup page is abnormal" into 24D1-dev 2024-04-03 03:14:13 +00:00
Weng Su
2101258e8a Restrict WifiDppConfiguratorActivity
- Don't show WifiDppConfiguratorActivity if user has DISALLOW_ADD_WIFI_CONFIG

- Don't show AddNetworkFragment if user has DISALLOW_ADD_WIFI_CONFIG

Fix: 299931076
Flag: None
Test: manual test with TestDPC
atest -c SettingsUnitTests:AddNetworkFragmentTest \
         SettingsUnitTests:WifiDppConfiguratorActivityTest

Change-Id: I34afe0f698e2dc43eba59b25f5f3f4f61e70166a
2024-04-03 10:45:43 +08:00
Treehugger Robot
f6c7511996 Merge "[Settings] fix Settings crash on App info for archived apps" into main 2024-04-03 00:14:45 +00:00
Hakjun Choi
0c2927a234 Merge "Make satellite more info url carrier configurable" into 24D1-dev am: df0ea6c723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26684988

Change-Id: I274e82a7cd279625ceb9ddda8442bbaf3d746ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 23:19:43 +00:00
josephpv
e1acfb3db1 Show customized message for private space while choosing lock
The change adds private profile checks in addition to the exisiting
managed profile check to show customized message while choosing lock for
private profile in Pattern, PIN and Password screens.

Bug: 311343571
Test: Verify lock screen message for private space
Change-Id: Ic8173ff8c1af23fc593390acaff4c67390f99b9c
Merged-In: Ic8173ff8c1af23fc593390acaff4c67390f99b9c
2024-04-02 23:12:43 +00:00
Hakjun Choi
df0ea6c723 Merge "Make satellite more info url carrier configurable" into 24D1-dev 2024-04-02 23:03:24 +00:00
Marcus Ge
c3f57aa3ba Merge "[Accessibility] Restore high contrast text" into main 2024-04-02 22:57:40 +00:00
Songchun Fan
faeaa7650e [Settings] fix Settings crash on App info for archived apps
For archived apps, isClearRestrictionAllowed (introduced in ag/26048774)
can throw NameNotFoundException, which causes Settings app to crash if
uncaught. This CL fixes that.

Test: manual by archiving an app and then try to go to it's app info
page
BUG: 332397754

Change-Id: I49a39dba36261f36215f0389ffe41523e8a2f4e8
2024-04-02 22:09:57 +00:00
Joshua Mccloskey
90552bb255 Merge "Removed period from fp delete dialog." into main 2024-04-02 19:24:08 +00:00
Bill Yi
06466ee253 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: d52215885e -s ours
am skip reason: contains skip directive

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

Change-Id: I0c6116b55005219f33e7533a0aa391e74334db60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 19:04:40 +00:00
Bill Yi
1449377090 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb74a16786 -s ours
am skip reason: contains skip directive

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

Change-Id: I874d98fe1e9c3b1e8295ff481784c7ddb8a47434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 19:04:27 +00:00
Bill Yi
d52215885e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-04-02 18:47:09 +00:00
Joshua Mccloskey
398b73a9fb Merge "UDFPS Enrollment refactor (3/N)" into main 2024-04-02 18:20:03 +00:00
Joshua McCloskey
4a499bb9b2 Removed period from fp delete dialog.
Note that this removes the period from english & all translations,
DeleteFingerprintDialog & ConfirmLastDeleteDialog should be the same.

Test: Manual.
Fixes: 331758381
Change-Id: I774375ed575bfdfd3ec181d902a99d918596890c
2024-04-02 18:10:05 +00:00
Kyle Zhang
9c0ad21257 Merge "Allow CDM version v19 or later" into main 2024-04-02 17:58:25 +00:00
Becca Hughes
13c6b07868 Pass the package name from the intent to the picker fragment
When an app uses the legacy autofill intent to launch the
settings activity we should pass the package name of the
launching app to the picker. If the app is then picked by
the user we will return result_ok to the app and if it
is not picked we will return result_cancel.

Change-Id: I99dbfad2c69ed57ff891c189f726ecc408d9d188
Test: ondevice manual
Bug: 324197609
2024-04-02 17:53:30 +00:00
Treehugger Robot
b8aae0edad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2244c6296f -s ours
am skip reason: contains skip directive

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

Change-Id: Ic63de969166c57b18862045395f59b9566730355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:55:44 +00:00
Bill Yi
4464313c9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d0769751a -s ours
am skip reason: contains skip directive

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

Change-Id: If21390190b16fd7107954bab0f3bc6ea08309bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:55:29 +00:00
Treehugger Robot
6571fe1f2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: b7b1943428 -s ours
am skip reason: contains skip directive

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

Change-Id: I70dd865af37f1e19754c72c10ade0bd02771121d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:55:26 +00:00
Bill Yi
a88924aee1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5741c891a4 -s ours
am skip reason: contains skip directive

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

Change-Id: I6b8188e862ae1eb7e35ad246fbbf3b6e001e38f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:55:22 +00:00
Bill Yi
6f13e84083 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b53bbda642 -s ours
am skip reason: contains skip directive

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

Change-Id: If23979d694c617f87ed03614838996d758f17df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:55:14 +00:00
Bill Yi
0a444d4d83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d947dfd61 -s ours
am skip reason: contains skip directive

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

Change-Id: I92fd6c1c8e71349fecaadc1ac90da09f002c6899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:45:26 +00:00
Treehugger Robot
2244c6296f Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-02 16:40:12 +00:00
Treehugger Robot
b7b1943428 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-02 16:40:12 +00:00
Treehugger Robot
bec80ea502 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-02 16:34:08 +00:00
Treehugger Robot
0d4027afdf Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-02 16:34:08 +00:00
Treehugger Robot
ffc3fef29a Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-02 16:34:08 +00:00
Rafael Higuera Silva
1bf1b02c31 Merge "Add new warning dialogue when user is Resetting mobile network settings." into main 2024-04-02 16:26:20 +00:00
Manish Singh
3c5938bf45 Use the filter to filter out the private apps
in the private profile when the private profile is in quiet mode.

Bug: 323327330
Test: manual
Change-Id: I30b14a843f388a9c83d0439b004f761328b74d64
2024-04-02 16:10:01 +00:00
Treehugger Robot
6c3f348f87 Merge "Use disabled summary when trustagents are disabled" into main 2024-04-02 15:35:58 +00:00
Treehugger Robot
a9f137842a Merge "Fix MobileNetworkSettings kotlin.UninitializedPropertyAccessException" into main 2024-04-02 12:12:11 +00:00
Xinyi Mao
9db553f264 Merge changes from topic "screentime" into main
* changes:
  Fix summary for system components which 30 sec <= usage time < 1 min.
  Fix purge condition for system component in BatteryDiffData.
2024-04-02 10:59:14 +00:00
songferngwang
34cec1389e Fix MobileNetworkSettings kotlin.UninitializedPropertyAccessException
Bug: 332477183
Test: atest MmsMessagePreferenceControllerTest

Change-Id: I849ca0f333f5246d73192ae4180b3f3ce3946d61
2024-04-02 10:18:03 +00:00
Chaohui Wang
00c21da30e Correct the data usage warning
- For MATCH_WIFI, only shown non carrier warning when has SIM
- For others, restore the previous operator warning

Bug: 331184249
Test: manual - on DataUsageList
Change-Id: I5d5c6b36c6874a547cc635c025aa77acadf6e1e3
2024-04-02 17:14:42 +08:00
mxyyiyi
52672ca34b Fix summary for system components which 30 sec <= usage time < 1 min.
- formatElapsedTimeWithoutComma(withSecords = false,) will round up minutes by adding 30 seconds.
https://screenshot.googleplex.com/8HrDpLi8FX8tjJy

Bug: 321265878
Test: Manual
Change-Id: I779bd7c33bbb3aefa0a88f6ba42d047259bc50cc
2024-04-02 17:00:51 +08:00
Fan Wu
a6289cddd9 Merge "Remove LooperMode.LEGACY usage from settings/development" into main 2024-04-02 08:13:37 +00:00
Treehugger Robot
22d908e932 Merge "Remove the char limit of unrestricted_app" into main 2024-04-02 08:09:49 +00:00
Samuel Huang
c6e13c10c4 Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook
SATELLITE_COMMUNICATION is a signature|privileged permission. Used to get satellite status.

Bug: 330585109
Test: presubmit
Change-Id: I35b226eeaa7fd018c658148c7496d9638fe8ecb7
Merged-In: I117dab50b8157e2f81de7b1ff6998c45fb84c734
2024-04-02 07:59:10 +00:00
Bill Yi
5741c891a4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic722868e89180dc62654f8055a4c680bb63629da
2024-04-01 23:55:30 -07:00
Bill Yi
e54d35f774 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id4cdb977175bdc2dd6291873303a461efba52273
2024-04-01 23:54:33 -07:00
Bill Yi
7d0769751a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9c2e2f93b1032426c8ff1c6eccb1a095be3afe51
2024-04-01 23:52:07 -07:00