Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,150 Commits 1 Branch 0 Tags
225bb7be88bd3df6e3d19ce991bd411e70da426a
Commit Graph

21977 Commits

Author SHA1 Message Date
Chris Antol
06e3b08891 Merge "Fix NPE in AudioSwitchPreferenceController" into main 2024-05-09 17:46:53 +00:00
Chaohui Wang
5a85f6a72f Reduce mobileDataEnabledFlow_forSubIdNotChanged flaky 
Bug: 338300477
Test: unit test
Change-Id: Id45e5228b60581b00d92e38f553a22631fb5c9b2
 2024-05-09 14:29:30 +00:00
Treehugger Robot
8e4223c769 Merge "Revert "Checks WEP password lengths of Wi-Fi network"" into main 2024-05-09 08:00:14 +00:00
Tom Hsu
74f5d8c191 Merge "Show dialog on BT entries in Settings" into main 2024-05-09 06:54:11 +00:00
Weng Su
2e25a60436 Revert "Checks WEP password lengths of Wi-Fi network" 
This reverts commit 1cd3b6f21f.

Reason for revert:
http://b/338298452 Can't connect to WEP network because incorrect passphrase length check  

Change-Id: I4e152a0c89e9ee11b4faa957061b6e9844b1a0c4
 2024-05-09 06:49:41 +00:00
tomhsu
c8f52f816c Show dialog on BT entries in Settings 
- When satellite mode is switched on BT entries shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: Ic9b6d44731684d1cfba87570d72dcacb905a66d2
 2024-05-09 04:32:09 +00:00
Chris Antol
7ac80f0a0a Fix NPE in AudioSwitchPreferenceController 
Change-Id: Ic97d1a6269a6d98ffd15a9b512f6ae24ff1c5b5e
Test: Unit Test to verify nullness
Bug: 338892614
 2024-05-09 01:25:24 +00:00
Ang Li
9e4b73a2fa Merge "Adapt to the new API of ShadowCaptioningManager." into main am: 1d591b26a9 am: ae15c01dcc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3080265

Change-Id: Ib0297be4453b1450eca244ce94705eebc31ef090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 01:00:18 +00:00
Ang Li
f0e6f12f10 Adapt to the new API of ShadowCaptioningManager. 
Test: Presubmit.
Change-Id: If90894a2438ff5e0aec8e727036f7a656f4c712a
 2024-05-08 22:16:33 +00:00
Joshua Mccloskey
1b55eb8bfc Merge "Update face & fingerprint pref logic" into main 2024-05-08 18:08:06 +00:00
Chaohui Wang
46a70d0369 Merge "Fix data usage when policy has no cycle" into 24D1-dev am: bb90a2c5c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27209264

Change-Id: Ib349fb3eed75dc0d399d9a07355e170e30d1d985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-08 08:56:39 +00:00
Chaohui Wang
bb90a2c5c8 Merge "Fix data usage when policy has no cycle" into 24D1-dev 2024-05-08 08:33:18 +00:00
tomhsu
c0b39601bf Show dialog on Wifi, and APM' entries in Settings 
- When satellite mode is switched on Wifi, and APM entry shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: I45cd92a8688e7a619613361ea4a8d58a0984d99f
(cherry picked from commit 29b2f16edf)
Merged-In: I45cd92a8688e7a619613361ea4a8d58a0984d99f
 2024-05-08 05:40:36 +00:00
Tom Hsu
c495d92a25 Merge "Show dialog on Wifi, and APM' entries in Settings" into main 2024-05-08 04:37:28 +00:00
tomhsu
29b2f16edf Show dialog on Wifi, and APM' entries in Settings 
- When satellite mode is switched on Wifi, and APM entry shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: I45cd92a8688e7a619613361ea4a8d58a0984d99f
 2024-05-08 03:53:32 +00:00
Mill Chen
63742cabe4 Merge "Deprecated Wifi panel and relevant objects" into main 2024-05-08 01:28:15 +00:00
Mill Chen
42ef04eb80 Merge "Deprecate Nfc panel and relevant objects" into main 2024-05-08 01:27:49 +00:00
Mill Chen
cd1537ee05 Merge "Deprecate Volume panel and relevant objects" into main 2024-05-08 01:27:11 +00:00
Mill Chen
cf28a1bd8e Merge "Redirect Volume Panel to settings page" into main 2024-05-07 23:58:33 +00:00
Joshua McCloskey
3e25356829 Update face & fingerprint pref logic 
This change makes it possible for face & fingerprint settings to be
presented to the user only to delete their face/fingerprint if the
feature has been disabled by a device admin.

Bug: 323280069
Test: atest BiometricFaceStatusPreferenceControllerTest
BiometricFingerprintStatusPreferenceControllerTest

Change-Id: I62cab3ddf7cf708d1b0b4da61dc3ffb7052dee84
 2024-05-07 18:12:41 +00:00
Chaohui Wang
33df5bb68b Fix isInCallFlow when no active subscription am: c63f06d4c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27205448

Change-Id: I5a58046c3e7ed2a1164648516248b39ee4feb5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 14:48:55 +00:00
Chaohui Wang
107cca7a77 Fix data usage when policy has no cycle 
Fallback to four weeks, as the same as no policy.

Fix: 336108815
Test: manual - on DataUsageList
Test: unit test
Change-Id: I63140a13ea3f3ee790cc911432fbdfd6247f7318
 2024-05-07 14:22:35 +00:00
Treehugger Robot
0212b6770e Merge "Fix AppStateAppBatteryUsageBridge test fail" into main 2024-05-07 13:46:15 +00:00
Chaohui Wang
c63f06d4c8 Fix isInCallFlow when no active subscription 
Direct emit false in this case to fix.

Fix: 338484668
Test: manual - on SIMs
Test: unit test
Change-Id: I5286701160d95b1c06e577db6232f7e70f040cdb
 2024-05-07 10:57:24 +00:00
Yiling Chuang
eda8e23f78 Merge "Update strings for charging optimization mode." into main 2024-05-07 08:48:29 +00:00
Wesley Wang
9b68d1b5fb Fix AppStateAppBatteryUsageBridge test fail 
- Remove mock context to fix the component cast issue

Bug: 337417563
Fix: 337417563
Test: atest SettingsUnitTests
Change-Id: I2d375a4828d2a7b020f15535383c07e4f017bb84
 2024-05-07 16:38:12 +08:00
Yiling Chuang
7b77729db6 Update strings for charging optimization mode. 
Update the battery settings summary and the charging string on the Battery settings page if charging optimization mode is applied.

Bug: 329020954
Test: atest SettingsRoboTests
Change-Id: Ie906a010d70bcef7fafe235f0287b289ea934705
 2024-05-07 06:34:24 +00:00
Pawan Wagh
412739469c Merge "Show persistent notification for page-agnostic mode" into main am: 4795662e6a am: e84cce90b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073296

Change-Id: I886b3bdfcc3ea8d554862002aa8c89f4d63b1a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 02:43:24 +00:00
Pawan Wagh
4795662e6a Merge "Show persistent notification for page-agnostic mode" into main 2024-05-07 02:13:53 +00:00
Mill Chen
f4d7fe3082 Deprecate Volume panel and relevant objects 
Bug: 328529042
Test: robotest
Change-Id: I462ddb72b2f764a016d957cc4195fc8298c5f21d
 2024-05-06 22:33:06 +00:00
Mill Chen
840aa5e40b Deprecate Nfc panel and relevant objects 
Bug: 328528962
Test: robotest
Change-Id: Ia2acf4268e9a444d8b4cfe36c6eb2bd198f4be64
 2024-05-06 22:27:02 +00:00
Mill Chen
4c061771b7 Deprecated Wifi panel and relevant objects 
Bug: 328529085
Test: robotest
Change-Id: I960718acbdf1d2be6c3b6b396cf2ac69d4aa3046
 2024-05-06 22:22:52 +00:00
Pawan Wagh
a697fba513 Show persistent notification for page-agnostic mode 
When device enters page-agnostic mode using 16KB developer
options, show notification to user using boot receiver and service.
On clicked on notification, show detailed instructions on how to
get back to production mode. Removing OEM carrier unlock allowed
condition.

Bug: 295035851
Bug: 338139755
Bug: 302600682
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: Ib7a57af4c6151d2a8da1ec94130532d10b1679aa
 2024-05-06 22:16:27 +00:00
Mill Chen
e4f785c773 Redirect Volume Panel to settings page 
Flag: com.android.settings.flags.slices_retirement
Bug: 328529042
Bug: 202262476
Test: manual test
adb shell am start -a android.settings.panel.action.VOLUME

Change-Id: I54f30d18eb10db864dcf5ee745b168b03e388b14
 2024-05-06 18:13:37 +00:00
Eric Biggers
9ab4bf20f7 Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431 am: 231766c463 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3061866

Change-Id: I66a91364d8211acf73310d55997bd5f6d08e2ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-06 18:09:47 +00:00
Eric Biggers
790e28c431 Merge changes I20f2330d,Iaca5b20c into main 
* changes:
  Remove unused class ShadowKeyStore
  Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
 2024-05-06 17:36:00 +00:00
Chaohui Wang
ffcbbd375a Clean up MobileNetworkSummaryStatus 
Fix: 338904413
Test: m Settings
Change-Id: Ic26bf7833c8fbdbeffc4f47dcd6dcd6191394e1b
 2024-05-06 07:26:06 +00:00
Fan Wu
45cf636b1a Merge "Update test looper mode to INSTRUMENTATION" into main 2024-05-06 03:08:27 +00:00
Pajace Chen
c7f595814b Merge "Fix test case failed issue" into 24D1-dev am: df8dc5dc61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27200838

Change-Id: I988aa8852b922f9a05a2352850d803ea3feb7e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 02:37:33 +00:00
Jason Chiu
41bd910d11 Merge "Check whether the user is a sub profile before starting Settings homepage" into main 2024-05-03 02:14:26 +00:00
Pajace Chen
df8dc5dc61 Merge "Fix test case failed issue" into 24D1-dev 2024-05-03 02:08:09 +00:00
pajacechen
1d03a55ea8 Fix test case failed issue 
This test case is not really failed, it doesn't break the functionality
of production code. The reason for failure is caused by the timeZone.
A different timezone could result in a different time string.
So, ignore this test case for now.

Test: Unit Test
Fix: 338343937
Change-Id: Iab0f6f2d454f226568ac09a49ae5372f3a9bc88f
 2024-05-03 01:59:40 +00:00
Jason Chiu
bd74caeb99 Check whether the user is a sub profile before starting Settings homepage 
Fix: 336449492
Test: atest SettingsHomepageActivityTest LocationInjectedServicesPreferenceControllerTest UserDetailsSettingsTest ActionDisabledByAdminDialogHelperTest ProfileSelectFragmentTest ProfileSelectLocationFragmentTest
- Start a managed app's info page
- Start a private app's info page
- Switch to a secondary user and start Settings
- Switch to the guest user and start Settings

Change-Id: I1c7c95d95c4739d70839a742ebc4e72b59b1d555
 2024-05-02 10:17:28 +08:00
Treehugger Robot
72ba6ec2ca Merge "Rename Multiple users page to Users" into main 2024-05-01 09:47:56 +00:00
Treehugger Robot
b48c66ebea Merge "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" into main 2024-04-30 21:44:24 +00:00
Joshua Mccloskey
968015c4e6 Merge "Restart fingerprint auth on cancel." into main 2024-04-30 20:51:44 +00:00
Tetiana Meronyk
177e852ea9 Rename Multiple users page to Users 
Ensure it is still searchable by "multiple users" prompt.

Bug: 336764972
Test: manual
Change-Id: I1126bfe601b75532882d6158d82be1a3b566aefc
 2024-04-30 18:48:40 +00:00
Chaohui Wang
ad9c64fcdc Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev am: bbc3a352e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150958

Change-Id: I8398dcad2f0c0da66cf9c579c5adb5f4c91c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 08:12:16 +00:00
Chaohui Wang
bbc3a352e3 Merge "Reapply "Create CallStateRepository.isInCallFlow"" into 24D1-dev 2024-04-30 07:47:30 +00:00
Tom Hsu
219fb8a3f6 Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 0a8d830616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27150955

Change-Id: I02b98dfea84be429e9a46dc8d0e3846dda29f203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 07:24:09 +00:00