Jay Wang
1d6753e339
[automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9
-s ours am: 954a3bd85a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I3539bf908be2a2524989d486407a7ecccfaf730b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 14:37:13 +00:00
YK Hung
2901d2948e
[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: Icbb954270e7c17821ec59a147a66d1d7f8a06d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 14:16:22 +00:00
Jay Wang
954a3bd85a
[automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I4e528f792bc6b94934d0d35e5a8d8de4fe846f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 14:16:12 +00:00
YK Hung
5a5550e4e5
Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev
2024-11-13 13:57:53 +00:00
ELIYAZ MOMIN (xWF)
1bbe798c8f
Revert "Migrate Battery percentage preference into catalyst. Ref..."
...
Revert submission 30294757-catalyst_battery_percentage
Reason for revert: <Potential culprit for b/378858348 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>
Reverted changes: /q/submissionid:30294757-catalyst_battery_percentage
Change-Id: I17a124619a1d6c7b6930a1c26c2b84c1a52ce8f7
2024-11-13 13:39:43 +00:00
Lars Svensson
3eb06a9077
Add android:key to device info PreferenceCategories
...
Add group key to PreferenceCategory "Legal & regulatory",
and "Device identifiers" making injection of preferences in
this section possible.
Change-Id: Ic178f402fb993cbd4be7c3f0713496acf2a6938a
2024-11-13 13:20:38 +01:00
Matías Hernández
68158ee324
Merge "Use full day names in the a11y version of schedules in mode list descriptions" into main
2024-11-13 12:16:07 +00:00
Yiyi Shen
ebcff7ee19
Merge "[Audiosharing] Fix hysteresis mode" into main
2024-11-13 09:19:50 +00:00
Roy Chou
04715ae017
Merge "feat(brightness suw): adjust brightness toggles UI and remove autobrightness standalone page" into main
2024-11-13 08:22:07 +00:00
Chaohui Wang
31d6287fef
Merge "Clean up ApnSettings unused fields" into main
2024-11-13 07:17:01 +00:00
Yuchen Sun
48023a8d51
Merge "[Catalyst] Create datastore for AdaptiveConnectivityToggle." into main
2024-11-13 06:05:51 +00:00
Chelsea Hao
822def2d56
Merge "Enable audio sharing hysteresis mode fix when preview is on." into main
2024-11-13 05:32:26 +00:00
Chaohui Wang
a9b4073e0a
Clean up ApnSettings unused fields
...
Bug: 374226933
Flag: EXEMPT clean up
Test: manual - on ApnSettings
Change-Id: If5e4aa6b8e10a138284f97eb840065895d4e5371
2024-11-13 13:17:03 +08:00
Treehugger Robot
7c8cd322c7
Merge "Migrate Battery percentage preference into catalyst. Refactor logic from BatteryPercentagePreferenceController to BatteryPercentageSwitchPreference" into main
2024-11-13 04:53:32 +00:00
Chaohui Wang
2ea7568542
Merge "Unify and merge two hasAllApns()" into main
2024-11-13 03:32:28 +00:00
Jay Wang
9a91334dc9
RESTRICT AUTOMERGE Add battery replacement strings
...
Bug: 376148038
Test: local test
Change-Id: I9d734e4c08da50fd018c512f767ad0432a175b86
2024-11-13 03:19:12 +00:00
Yuchen
88df8aa993
[Catalyst] Create datastore for AdaptiveConnectivityToggle.
...
Bug: 368355361
Flag: com.android.settings.flags.catalyst_adaptive_connectivity
Test: atest AdaptiveConnectivityTogglePreferenceTest AdaptiveConnectivityScreenTest
NO_IFTTT=no added logic
Change-Id: I8c1f78bb89c24903e2672d619605a0249924b05a
2024-11-13 02:26:49 +00:00
Fan Wu
c2f72f3cea
Migrate Battery percentage preference into catalyst. Refactor logic from BatteryPercentagePreferenceController to BatteryPercentageSwitchPreference
...
Bug: 372774754
Test: atest and manual test
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
NO_IFTTT=already updated.
Change-Id: I9a259b966a832293e067c9f06c4c98479cb538a2
2024-11-13 01:28:02 +00:00
Treehugger Robot
70b962a8a5
Merge "Handle null audio attributes" into main
2024-11-12 23:15:13 +00:00
Julia Reynolds
987d14b8df
Merge "reduce number of binder calls when loading page" into main
2024-11-12 22:00:26 +00:00
Julia Reynolds
d6c932cd7e
Handle null audio attributes
...
Test: SoundPreferenceControllerTest
Fixes: 358540739
Flag: EXEMPT bugfix
Change-Id: I9a0e6066ccc2315b276564178c13ed59dd22162b
2024-11-12 20:27:23 +00:00
Guojing Yuan
ff0ea037bf
Remove the margin in Device Detail page
...
Change-Id: I1add40d94bf1a433d303866353e08a3d790db1ae
Fix: 377517620
Test: manual
Flag: EXEMPT bugfix
2024-11-12 18:40:43 +00:00
Julia Reynolds
a37572a4e5
reduce number of binder calls when loading page
...
Test: ZenModeAllBypassingAppsPreferenceControllerTest
Test: ZenModeAppsLinkPreferenceControllerTest
Test: manual - load page and validate that it loads a few seconds faster
Flag: EXEMPT bug fix
Fixes: 368623163
Change-Id: I6d34a21f0948b117a96beefc405de4b623f49609
2024-11-12 18:29:41 +00:00
Jacky Wang
2bab900fa0
[Catalyst] Add Data Saver settings metadata
...
Bug: 368359883
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I7a4fe8cdd73a551a2b281e3a5a3a0f269b54ee5e
2024-11-13 02:10:48 +08:00
Jacky Wang
8fab3bf097
Merge changes from topic "catalyst-DataSaver" into main
...
* changes:
[Catalyst] Migrate "Use Data Saver" settings
[Catalyst] Support main switch bar
2024-11-12 18:09:05 +00:00
Jacky Wang
d2d5a1c2f9
[Catalyst] Migrate "Use Data Saver" settings
...
Bug: 368359883
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I2ee30cdd5edbfb13b5bf67e4c3b93b787c52a767
2024-11-13 02:05:01 +08:00
Jacky Wang
6a52eeabbc
[Catalyst] Support main switch bar
...
MainSwitchBar is a view widget in activity layout stick to the top of
screen UI. There is no corresponding Preference in the preference
screen. For Catalyst support, introduce an invisible Preference object
to manipulate with MainSwitchBar, so that the binding mechanism is
still working on top of this abstraction.
Bug: 332201912
Flag: EXEMPT new class
Test: manual
Change-Id: If50932a443c1ed3ac04d3ea2e3273724d750297d
2024-11-13 02:05:01 +08:00
Wes Okuhara
76ca77b5f2
Merge "Settings: Fix queryShortcuts_shouldOnlyIncludeSystemApp test" into main
2024-11-12 18:00:38 +00:00
Andreea Costinas
25d8e56c53
Relax WiFi cert installation restrictions in HSUM mode
...
The Settings app runs under the current user, which previously lacked
the necessary permissions to install client certificates in HSUM mode.
This change allows any admin user to install these certificates.
Bug: b/370013519
Flag: EXEMPT bugfix
Test: manually installed and removed client certificate for WiFi
Change-Id: I57a7364c76a0adb7ed4112e48fb20070ab9d7bff
2024-11-12 10:40:26 +00:00
Zoey Chen
ab5dd02bd9
Merge "[Settings] Refactor: Add LocalePickerBaseListPreferenceController" into main
2024-11-12 10:27:33 +00:00
Yiyi Shen
cb32a15f1b
[Audiosharing] Fix hysteresis mode
...
1. Move start broadcast logic from onPlaybackStarted to
onBroadcastMetadataChanged
2. Move add source logic from onReceiveStateChanged(BIS>0) to
onSourceAdded
Test: atest
Bug: 355222285
Bug: 377658982
Flag: com.android.settingslib.flags.audio_sharing_hysteresis_mode_fix
Change-Id: Ie0a2345e16caa2804fede930d174a67f2ec60259
2024-11-12 17:48:26 +08:00
Treehugger Robot
e94e4cdc91
Merge "[Catalyst] Support multiple restriction keys" into main
2024-11-12 09:30:52 +00:00
Chaohui Wang
4e4ee7430c
Unify and merge two hasAllApns()
...
Also add unit tests.
Fix: 374226933
Flag: EXEMPT refactor
Test: manual - on ApnSettings
Test: atest ApnTypesTest
Change-Id: Ie82252ed13d81118292214b360ac49de9a81b7cc
2024-11-12 17:08:16 +08:00
Shaowei Shen
03e7eacc6e
Merge "[Touchpad & Mouse] Update title based on conditions" into main
2024-11-12 05:57:00 +00:00
Zoey Chen
31dfbdabf1
[Settings] Refactor: Add LocalePickerBaseListPreferenceController
...
Bug: 377664066
Flag: EXEMPT refactor
Change-Id: I54d212ea520b67263f5b797175936c046a534519
2024-11-12 05:50:50 +00:00
chelseahao
103ce4efa2
Enable audio sharing hysteresis mode fix when preview is on.
...
Test: atest
Bug: 368401233
Flag: com.android.settingslib.flags.audio_sharing_developer_option
Change-Id: I3dad42011aadcfd1a2670d297c8e000d1b92324a
2024-11-12 05:49:34 +00:00
Xin Li
cfa19e11a6
Merge 24Q4 (ab/12406339) into aosp-main-future
...
Bug: 370570306
Merged-In: Ie90e7495dd4a134538bae6e3e08eea0d02134b14
Change-Id: I20517e9ee410e95f2cbeb1247c0c0288ed9f006f
2024-11-11 21:38:40 -08:00
Jacky Wang
865e9b29f5
[Catalyst] Support multiple restriction keys
...
NO_IFTTT=Catalyst only
Bug: 377600992
Flag: com.android.settings.flags.catalyst
Test: testdpc
Change-Id: If7212b5402f7e271b7fdbd2a43bed0e11ee6f15f
2024-11-12 13:19:16 +08:00
Jaewan Kim
a1abfdcaca
Merge "Clear Linux terminal app when disabled" into main am: 005ee9761b
am: c4d90bf739
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3332054
Change-Id: Ifc0064dd155a9b4d5faf55d496f6cba3ef097251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-12 04:46:29 +00:00
Jaewan Kim
c4d90bf739
Merge "Clear Linux terminal app when disabled" into main am: 005ee9761b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3332054
Change-Id: I4989ce036205f873d5bfb7ef876b7f573fbe0284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-12 04:12:47 +00:00
Jaewan Kim
005ee9761b
Merge "Clear Linux terminal app when disabled" into main
2024-11-12 03:49:41 +00:00
Jaewan Kim
ea0b5d5950
Clear Linux terminal app when disabled
...
Bug: 374032310
Test: Manual, T/H
Flag: Build.RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES
Change-Id: Id56f98cf90b0598111baa3096b1b81307ebb99a3
2024-11-12 01:19:17 +00:00
Bill Yi
dbf763064b
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-11 21:52:24 +00:00
Bill Yi
2ba1fe6e5f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-11 21:52:24 +00:00
Bill Yi
ba15d2a90f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-11-11 21:52:24 +00:00
Hao Dong
d97646984c
Merge "Fix work apps interceptor biometric prompt icon." into main
2024-11-11 21:18:10 +00:00
Daniel Norman
453aa677e6
Merge "Enable HearingAids#AudioRouting page search if the device supports hearing aid" into main
2024-11-11 20:14:31 +00:00
Treehugger Robot
0e69ab1a0d
Merge "Make Linux terminal option profile aware" into main am: 9089bca7d1
am: e3fe97469e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3332053
Change-Id: I8ea7ac95529afd0033b654d6144b012efcddf9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-11 19:00:44 +00:00
Treehugger Robot
71932d2814
Merge "Introduce overlaid BatterySaverGoogleScreen" into main
2024-11-11 18:50:33 +00:00
Treehugger Robot
1781aa3e46
Merge "Refine some preference name" into main
2024-11-11 18:48:08 +00:00