Zoey Chen
a15948b53e
[Settings] Refactor: Add SystemLocalePickerFragment
...
Bug: 377664066
Flag: EXEMPT refactor
Change-Id: I79805c639197911d10f3632e50b5feced08c2fd6
2024-11-14 07:05:30 +00:00
Fan Wu
14ba0b6571
Merge "Revert "Revert "Migrate Battery percentage preference into catal..."" into main
2024-11-14 03:24:54 +00:00
Fan Wu
a794e01d45
Revert "Revert "Migrate Battery percentage preference into catal..."
...
Revert submission 30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI
Reason for revert: the failures is part of the robolectric issue b/378822459. Tested locally that the change is not breaking ClockworkSetupWizardRoboTests.
Reverted changes: /q/submissionid:30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI
Change-Id: I2210002924650cb54c55a41be25d97a3997c065e
2024-11-14 01:59:16 +00:00
Bill Yi
33008bc693
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb
-s ours am: 9e6155da79
-s ours am: 13bc12e33a
-s ours am: 3b34ea671e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30383162
Change-Id: Ie52150fe73e0610016f449bb9ee306a3d64a3cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-14 01:58:36 +00:00
Bill Yi
3b34ea671e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb
-s ours am: 9e6155da79
-s ours am: 13bc12e33a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30383162
Change-Id: If5c65e9f66b3dd4e6d0b9e4968a4d075f1c266f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-14 01:11:54 +00:00
Bill Yi
4b96a98baf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb
-s ours am: 9e6155da79
-s ours am: eaefa87f37
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30383162
Change-Id: I54d9f26d222d59f7667c80726b572cfcda3d9757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-14 01:11:34 +00:00
Treehugger Robot
70192430c3
Merge changes from topic "catalyst" into main
...
* changes:
Ignore failing NetworkDashboardScreenTest
[Catalyst] Update SettingsService
2024-11-14 01:10:39 +00:00
Bill Yi
eaefa87f37
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb
-s ours am: 9e6155da79
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30383162
Change-Id: I537639af4c9331cf5f901ccfa23dfc91756fd88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-14 00:49:25 +00:00
Bill Yi
13bc12e33a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb
-s ours am: 9e6155da79
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30383162
Change-Id: I122a4c7b7656fdd9468e65166f32cf695129c620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-14 00:47:44 +00:00
Bill Yi
9e6155da79
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56de354bdb
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30383162
Change-Id: I159af6766d0fbf51263b7453a1f2ab749410277d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-14 00:25:02 +00:00
Xin Li
91195f39f7
[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: cfa19e11a6
-s ours
...
am skip reason: Merged-In Ie90e7495dd4a134538bae6e3e08eea0d02134b14 with SHA-1 62449dd61b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30283926
Change-Id: I11bcec2767b9cf595fcb077ccf2a1cdbf0d2d7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 23:25:15 +00:00
Jacky Wang
66d6b92637
Ignore failing NetworkDashboardScreenTest
...
Bug: 368359883
Flag: TEST_ONLY
Test: atest
Change-Id: I3c6051fdd83376d7a56e0fffa157a7315431f841
2024-11-14 07:07:02 +08:00
Bill Yi
56de354bdb
Import translations. DO NOT MERGE ANYWHERE
...
BUG:377687053
Auto-generated-cl: translation import
Change-Id: I05db00761923bf98f069ef14f4b89a56c8a812dc
2024-11-13 22:43:37 +00:00
Jacky Wang
9a8fe4107d
[Catalyst] Update SettingsService
...
Bug: 373895596
Flag: com.android.settings.flags.catalyst_service
Test: Manual
Change-Id: I64d0b7bac3415894a8478fafe09b5f5d1a0ebb51
2024-11-14 03:52:41 +08:00
Guojing Yuan
b29b9b1b11
Merge "Remove the margin in Device Detail page" into main
2024-11-13 17:52:51 +00:00
YK Hung
0ce5caf47b
[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5
-s ours am: 2901d2948e
-s ours am: e0493334ee
-s ours am: 4426362dca
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I8dace101be77321ef591b5c29105494a997098eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 15:35:06 +00:00
Jay Wang
c32e31d9f6
[automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9
-s ours am: 954a3bd85a
-s ours am: 1d6753e339
-s ours am: 11558bd4b9
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I3dccb6d138cf44feb03dab2d39306e0c374b8f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 15:35:01 +00:00
ELIYAZ MOMIN (xWF)
2bd5ef25bd
Merge "Revert "Migrate Battery percentage preference into catalyst. Ref..."" into main
2024-11-13 15:16:23 +00:00
YK Hung
4426362dca
[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5
-s ours am: 2901d2948e
-s ours am: e0493334ee
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: Id35aa44c6c437756a1b6e4bc77962667953f1346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 15:11:47 +00:00
Jay Wang
11558bd4b9
[automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9
-s ours am: 954a3bd85a
-s ours am: 1d6753e339
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I2ca5dc3467ad397a2902df33da71588746e51a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 15:11:41 +00:00
YK Hung
43979f7905
[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5
-s ours am: 2901d2948e
-s ours am: 108a184888
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I7c00a9c9276847ffe480610fb72e3d47da42b175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 15:11:30 +00:00
Jay Wang
c32df9db80
[automerger skipped] RESTRICT AUTOMERGE Add battery replacement strings am: 9a91334dc9
-s ours am: 954a3bd85a
-s ours am: f88ab1fa2d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I26d802b3f2d3b6857928250483691637bb2880b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 15:11:23 +00:00
YK Hung
108a184888
[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5
-s ours am: 2901d2948e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I7a76ffacc1fb1bffcc28c307f192ca63dee649ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 14:38:56 +00:00
Jay Wang
f88ab1fa2d
[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: I9922b4c4a00e1d439d76dc19396310fc0312e0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 14:38:52 +00:00
YK Hung
e0493334ee
[automerger skipped] Merge "RESTRICT AUTOMERGE Add battery replacement strings" into tm-qpr-dev am: 5a5550e4e5
-s ours am: 2901d2948e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30352998
Change-Id: I982c0bdddb664eb11ba57a757f48167794a0a8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-11-13 14:37:19 +00:00
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
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