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
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
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
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
Mill Chen
f472d99145
Merge "Redirect NFC Panel to settings page" into main
2024-05-07 08:18:42 +00:00
Treehugger Robot
f671734c1b
Merge "Disallow turning off developer options in page-agnostic mode" into main am: 0d124654ca
am: 74da70de2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073278
Change-Id: I985bf4d4f78e2d17915d330430eae5818e7fb44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 07:03:35 +00:00
Treehugger Robot
74da70de2d
Merge "Disallow turning off developer options in page-agnostic mode" into main am: 0d124654ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073278
Change-Id: I87d83efc72a97bd942b522716d799efd6e5ed033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 06:44:32 +00: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
Treehugger Robot
0d124654ca
Merge "Disallow turning off developer options in page-agnostic mode" into main
2024-05-07 06:30:59 +00:00
Treehugger Robot
ecfed70bb3
Merge "[Install-unknown-apps] not include all the apps that have OP_REQUEST_INSTALL_PACKAGES granted" into main
2024-05-07 06:21:55 +00:00
mxyyiyi
03fdbbe504
Use material color res from settingslib for battery tips card
...
Settings Anomaly Card
[Before-Dark] https://screenshot.googleplex.com/5PZC6mbWjqunvuv
[Before-Light] https://screenshot.googleplex.com/7eoF6yLX6t3JeHz
[After-Dark] https://screenshot.googleplex.com/5j4mQFDXjkVcxHs
[After-Light] https://screenshot.googleplex.com/5ySzfzft9293GXb
App Anomaly Card
[Before-Dark] https://screenshot.googleplex.com/JKkcqCiAKxkPZds
[Before-Light] https://screenshot.googleplex.com/ASB4CnDhPjsQohH
[After-Dark] https://screenshot.googleplex.com/5y3LVvng54vndi9
[After-Light] https://screenshot.googleplex.com/NCJeuViCtDcNhiV
Bug: 339130556
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I29d68713c14068fd9961082a148dd02ad38289a6
2024-05-07 13:51:32 +08:00
Pawan Wagh
e4b9c69442
Disallow turning off developer options in page-agnostic mode
...
When device is in page-agnostic mode, it would be OEM unlocked and
filesystem will be different than production. Don't allow to turn
off developer options in that state.
Bug: 329657279
Bug: 295035851
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: I9b8a9dbaf8192bb3758c53501450eb45e2fe8d9c
2024-05-07 05:30:23 +00:00
SongFerng Wang
ceda48c70c
Merge "Add the OtherSection for NetworkCellularGroupProvider" into main
2024-05-07 04:58:28 +00:00
SongFerng Wang
3131ed3cef
Merge "Show sim onboarding for user when insert sim and no DDS" into main
2024-05-07 04:54:19 +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
8bd4c730fd
Merge "Make links in dialog text clickable" into main am: 12ff1e2422
am: f224840b37
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3072263
Change-Id: Ida544e3b0fd77e62b9a7e47f7a140705cf4d1471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:43:09 +00:00
Pawan Wagh
e84cce90b3
Merge "Show persistent notification for page-agnostic mode" into main am: 4795662e6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073296
Change-Id: Ic8c971596e79dd0fd54ba6c22b0c003cbd8564f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:29:30 +00:00
Chun-Ku Lin
49d1fa359d
Use system_ext as the container of the aconfig flags in Settings
...
Bug: 332723689
Test: Run `adb shell printflags` and verify the flags defined in aconfig
folders show up
Flags: EXEMPT aconfig file only changes
Change-Id: If0b497117c303a0bd0b366819c90bd11b41232c3
2024-05-07 02:29:25 +00:00
Pawan Wagh
f224840b37
Merge "Make links in dialog text clickable" into main am: 12ff1e2422
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3072263
Change-Id: Id907c80bdb3f090ea83bd7c74f3df329142b46cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-07 02:29:12 +00:00
Pawan Wagh
4795662e6a
Merge "Show persistent notification for page-agnostic mode" into main
2024-05-07 02:13:53 +00:00
Pawan Wagh
12ff1e2422
Merge "Make links in dialog text clickable" into main
2024-05-07 02:13:30 +00:00
Chun-Ku Lin
4959e0fba0
Add null pointer check to prevent crash
...
Bug: 338082036
Test: atest EditShortcutsPreferenceFragmentTest
Flag: EXEMPT bugfix low risk
Change-Id: I70f00eb2912e4ddd6efbd298ae6b6885f28160de
2024-05-07 02:10:25 +00:00
Pawan Wagh
b98a8acf9b
Turn off automatic updates in page-agnostic mode
...
Update global settings to disable updates in page-agnostic mode
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 302391134
Change-Id: I170bb3ffd50a08a1399bffcde23e5f111d9a5a1d
2024-05-06 22:17:30 +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
Treehugger Robot
94291dfd2d
Merge "Redirect Wifi Panel to settings page" into main
2024-05-06 19:13:19 +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
Mill Chen
1bd9cab5a0
Redirect Wifi Panel to settings page
...
Flag: com.android.settings.flags.slices_retirement
Bug: 328529085
Test: manual test
adb shell am start -a android.settings.panel.action.WIFI
Change-Id: Iaa7a7fd83000aa8106ceac486c8c96e3a9d1854d
2024-05-06 17:56:37 +00:00
Mill Chen
3905f1069a
Redirect NFC Panel to settings page
...
Flag: com.android.settings.flags.slices_retirement
Bug: 328528962
Test: manual test
adb shell am start -a android.settings.panel.action.NFC
Change-Id: I5232c9e8ed8608d8f27bedbef10c62d7cc12cb8e
2024-05-06 17:54:32 +00:00
Eric Biggers
231766c463
Merge changes I20f2330d,Iaca5b20c into main am: 790e28c431
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3061866
Change-Id: I1216169e50d35d6bd80cd016c55a0db77dc08830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-06 17:52:05 +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
songferngwang
5f3fc72bd4
Show sim onboarding for user when insert sim and no DDS
...
When the user remove the sim and then insert it back, the DDS may
be -1. If the DDS is -1, then the mobile data can not be turned on.
Show the sim onboarding for user for this case, the user can update
DDS by the flow.
Bug: 336380853
Test: verified UI
Change-Id: I7fd086cb08917f2cac2c1252585687179a2a2f93
2024-05-06 10:16:47 +00:00
songferngwang
8b2305acd4
Add the OtherSection for NetworkCellularGroupProvider
...
Bug: 338914255
Test: Verified the SIMs UI
Change-Id: I49d5e4126e43054b5d147de15d35805d1e445c38
2024-05-06 10:16:02 +00:00