Commit Graph

140120 Commits

Author SHA1 Message Date
Treehugger Robot
ee721eb86b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a48f19c101 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia6895a05e20c5f238fb5dd3d6089acb1ef26f3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:44:03 +00:00
Bill Yi
7faaae8722 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: faa97ab210 -s ours
am skip reason: contains skip directive

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

Change-Id: I62383ace361b9ad1e5fc293d039241275faee565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:43:52 +00:00
Treehugger Robot
a48f19c101 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-05-08 19:24:31 +00:00
Joshua Mccloskey
1b55eb8bfc Merge "Update face & fingerprint pref logic" into main 2024-05-08 18:08:06 +00:00
Tom Hsu
965da3df32 [automerger skipped] Fix build break am: 864122b8b7 -s ours
am skip reason: Merged-In I45cd92a8688e7a619613361ea4a8d58a0984d99f with SHA-1 c0b39601bf is already in history

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

Change-Id: I97feab53d388ec087c4dbac8b0d82013b8aedf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 09:03:45 +00:00
Tom Hsu
864122b8b7 Fix build break
Bug:339348046
Test: Build pass locally
Change-Id: I98db39d696617fc81fdad4e73419b34f5265b0ad
Merged-In: I45cd92a8688e7a619613361ea4a8d58a0984d99f
2024-05-08 08:56:44 +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
e9e59d86ba [automerger skipped] Show dialog on Wifi, and APM' entries in Settings am: c0b39601bf -s ours
am skip reason: Merged-In I45cd92a8688e7a619613361ea4a8d58a0984d99f with SHA-1 29b2f16edf is already in history

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

Change-Id: I890800a5c4fbe87563f2a29392d04e3e810d79df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 06:06:34 +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
SongFerng Wang
42b714f450 [automerger skipped] Merge "Refacotr mobile data observer for repository" into main am: 12d49a521c am: d97504f7f3 -s ours
am skip reason: Merged-In I26c8f946823abb7505f0227c8dd8ab0700d0c5f2 with SHA-1 0a9e7046cc is already in history

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

Change-Id: Ic5e3d02d811ff3e0a05eea0b31b3c62e2ae6a3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:38:10 +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
SongFerng Wang
23349d60c0 [automerger skipped] Merge "Refacotr mobile data observer for repository" into 24D1-dev am: bc4293cb4e -s ours
am skip reason: Merged-In I26c8f946823abb7505f0227c8dd8ab0700d0c5f2 with SHA-1 120adb2349 is already in history

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

Change-Id: I44f8c3e8fced25930ff4b73cb1cb99631f972641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:19:02 +00:00
Mengjun Leng
0c8d954451 [automerger skipped] Refacotr mobile data observer for repository am: 0a9e7046cc -s ours
am skip reason: Merged-In I26c8f946823abb7505f0227c8dd8ab0700d0c5f2 with SHA-1 120adb2349 is already in history

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

Change-Id: Ibd6261a5e6b23ca56a0e95f03c80af005b65e963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:18:59 +00:00
SongFerng Wang
d97504f7f3 Merge "Refacotr mobile data observer for repository" into main am: 12d49a521c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3059652

Change-Id: I50454802ab304a46699c0754fa077b79d637bc9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:18:53 +00:00
YK Hung
c6661d5c14 Merge "Add new action to log battery optimizaition mode updated by Turbo." into main 2024-05-08 04:04:52 +00:00
SongFerng Wang
12d49a521c Merge "Refacotr mobile data observer for repository" into main 2024-05-08 04:00:00 +00:00
SongFerng Wang
bc4293cb4e Merge "Refacotr mobile data observer for repository" into 24D1-dev 2024-05-08 03:59:47 +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
SongFerng Wang
36a00809a5 Merge "Avoid to show sim onboarding during the SUW" into main 2024-05-08 01:41:59 +00:00
Mengjun Leng
294e0db163 Refacotr mobile data observer for repository
In current design, the mobile data observer might be removed due to
SIM absence after registered so that mobile data network info can't
be updated to clients.

To fix it, migrate it to use API TelephonyCallback.onUserMobileDataStateChanged

Bug: 327696232
Test: manual + unit tests

Change-Id: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
Merged-In: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
2024-05-08 01:39:44 +00:00
SongFerng Wang
e2eed370e9 Merge "Refacotr mobile data observer for repository" into main 2024-05-08 01:38:57 +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
Bill Yi
faa97ab210 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0acd24de924d3d94f16985e24852b76a0523ab2b
2024-05-07 18:03:02 -07:00
Mill Chen
cf28a1bd8e Merge "Redirect Volume Panel to settings page" into main 2024-05-07 23:58:33 +00:00
Fiona Campbell
288d98797b Merge "Set EvenDimmer to true by default" into main 2024-05-07 21:26:02 +00:00
Ahmad Khalil
93fe16fc25 Merge "Make haptics team owners on vibration files in Settings" into main 2024-05-07 19:44:46 +00:00
Chun-Ku Lin
fdc7d4afa9 Merge "Add null pointer check to prevent crash" into main 2024-05-07 19:09:38 +00:00
Chun-Ku Lin
3e4247ad9a Merge "Use system_ext as the container of the aconfig flags in Settings" into main 2024-05-07 18:42:53 +00:00
Marcus Ge
ff99e1f72f Merge "[Settings] Migrate color roles to respect color contrast" into main 2024-05-07 18:17:14 +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
Daniel Kim
f000f82ac2 Merge "Replace credential provider placeholder" into main 2024-05-07 17:53:14 +00:00
Tetiana Meronyk
6d95ba3664 Merge "Remove telephony related settings preferences for HSUM devices" into main 2024-05-07 17:02:40 +00:00
Ahmad Khalil
37edeb1219 Make haptics team owners on vibration files in Settings
Updating owners file in settings/accessibility to make the haptics team owners on the vibration files in Settings.

No flag for changing owners, no UI changes.

Fix: 339187294
Test: N/A
Change-Id: I962040b509f40393101eadc76ca46afc2b0696ef
2024-05-07 16:34:06 +00:00
Automerger Merge Worker
276b1db7b2 Merge "Fix isInCallFlow when no active subscription am: c63f06d4c8" into main 2024-05-07 14:49:05 +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
Pawan Wagh
fca47dc818 Merge "Turn off automatic updates in page-agnostic mode" into main am: ef175b48f8 am: 9cd187ba6e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073273

Change-Id: Icec627b7b79ab932a76c6b5d2c60f3c9fc2477c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:48:46 +00:00
Pawan Wagh
9cd187ba6e Merge "Turn off automatic updates in page-agnostic mode" into main am: ef175b48f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073273

Change-Id: I6bb3f97b0ddc16c7914a26507b2820d3d5b51413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:28:23 +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
Pawan Wagh
ef175b48f8 Merge "Turn off automatic updates in page-agnostic mode" into main 2024-05-07 14:11:01 +00:00
Treehugger Robot
0212b6770e Merge "Fix AppStateAppBatteryUsageBridge test fail" into main 2024-05-07 13:46:15 +00:00
Ahmad Khalil
b905c0a0a7 Merge "Fix feedback for main haptic settings toggle" into main 2024-05-07 13:06:47 +00:00
Fiona Campbell
8443ce8f9a Set EvenDimmer to true by default
- Read from setting with true as fallback

Bug: 336476693
Test: atest DisplayServiceTests
Test: manual up/downgrade with settings / off

Change-Id: I5279db2b35af9e84057d8f89bbbe9f26c62237c6
2024-05-07 12:29:10 +00:00
Treehugger Robot
f348f87508 Merge "Use material color res from settingslib for battery tips card" into main 2024-05-07 11:18:33 +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
Chaohui Wang
179a7204a3 Merge "Clean up unused params from SubscriptionAnnotation" into main 2024-05-07 09:40:34 +00:00
Jason Chang
42af64f9df Fix the text under the "Setup for limited vision or head motion" am: f1be1400b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27219697

Change-Id: I6d8228ffe04b9401c723bb790bfed8d8a061a34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 09:39:14 +00:00
Mengjun Leng
120adb2349 Refacotr mobile data observer for repository
In current design, the mobile data observer might be removed due to
SIM absence after registered so that mobile data network info can't
be updated to clients.

To fix it, migrate it to use API TelephonyCallback.onUserMobileDataStateChanged
Bug: 327696232

Change-Id: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
2024-05-07 09:35:28 +00:00