Commit Graph

145255 Commits

Author SHA1 Message Date
Xin Li
5bfde9fbf5 Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
2025-02-26 11:59:26 -08:00
Treehugger Robot
188402ad16 Merge "[owners] Remove clairewang@google.com from src/com/android/settings/fuelgauge/protos/OWNERS" into main am: 30d4456166
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3319554

Change-Id: I78cae04000aa905d14a061fcf04ca8aa6154778b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-25 13:35:23 -08:00
Treehugger Robot
30d4456166 Merge "[owners] Remove clairewang@google.com from src/com/android/settings/fuelgauge/protos/OWNERS" into main 2025-02-25 13:02:39 -08:00
Treehugger Robot
851c8a5ff6 Merge "Use SwitchPreferenceCompat for UI consistency" into main am: 77f21a8d0a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3502129

Change-Id: I932bcbfd0f9b444ec87de09bfbf1eb57ebdfe803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-24 18:29:19 -08:00
Treehugger Robot
77f21a8d0a Merge "Use SwitchPreferenceCompat for UI consistency" into main 2025-02-24 18:12:06 -08:00
Owner Cleanup Bot
59781d008c Merge "[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS" into main am: b384fe708b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3504631

Change-Id: I179e8b48c9fb0943714de02ed4b8ca2e9d1de7bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-24 06:58:52 -08:00
Owner Cleanup Bot
b384fe708b Merge "[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS" into main 2025-02-24 06:26:16 -08:00
Owner Cleanup Bot
125a6223af [owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.

Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy.  We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain.  It can always be
reverted if needed.

If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.

See the owner's recent review activity for context:
https://android-review.googlesource.com/q/zhangjerry@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Icfd162bf283cf74e3270d97a8ac15dcb2dfb34d3
2025-02-22 09:05:23 -08:00
Owner Cleanup Bot
1a2021fe66 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS" into main am: f16b9f85a1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3499870

Change-Id: If51ca705603b0f00e776f7c2b98ee12c0dccaaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 11:45:37 -08:00
Owner Cleanup Bot
62651fd633 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS" into main am: 0d7517c021
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497484

Change-Id: I3d477b780ba85e4c214de837b6bbab425b13aff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 11:45:24 -08:00
Owner Cleanup Bot
01d42a8f16 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS" into main am: f7457e99a2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497483

Change-Id: Ibab36faa75e1d4c187af9d674ccecfe1575413b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 11:44:00 -08:00
Owner Cleanup Bot
f16b9f85a1 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS" into main 2025-02-21 11:15:59 -08:00
Owner Cleanup Bot
0d7517c021 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS" into main 2025-02-21 11:13:55 -08:00
Owner Cleanup Bot
f7457e99a2 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS" into main 2025-02-21 11:13:51 -08:00
Owner Cleanup Bot
1ea637ca4b Merge "[owners] Remove arcwang@google.com from src/com/android/settings/wifi/OWNERS" into main am: 0997a62f67
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3503652

Change-Id: I7e14c37e2529e6ae8a9497eb7dd58155dd84a1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-21 06:44:48 -08:00
Owner Cleanup Bot
0997a62f67 Merge "[owners] Remove arcwang@google.com from src/com/android/settings/wifi/OWNERS" into main 2025-02-21 06:25:48 -08:00
Pawan Wagh
1c2464aae4 Merge "16KB -> 16 KB" into main am: 63a8931a41
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3501682

Change-Id: If770afce411e6692848b2308239c626a53803c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-20 19:49:11 -08:00
Pawan Wagh
60c7026389 Merge "Connect and enable root before running each testcase" into main am: b03384d426
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3501231

Change-Id: I4e5e5500d64199e2c4a77a2d643d7131cbe7ef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-20 19:48:46 -08:00
Pawan Wagh
63a8931a41 Merge "16KB -> 16 KB" into main 2025-02-20 19:28:35 -08:00
Pawan Wagh
b03384d426 Merge "Connect and enable root before running each testcase" into main 2025-02-20 19:28:03 -08:00
Pawan Wagh
602cec999b Use SwitchPreferenceCompat for UI consistency
Test: Install Settings and Check UI
Bug: N/A
Change-Id: Idf17d4d7616b6d45403e1c19857f5a33b27b04c2
2025-02-21 01:24:42 +00:00
Owner Cleanup Bot
a25b7045e9 [owners] Remove arcwang@google.com from src/com/android/settings/wifi/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.

Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy.  We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain.  It can always be
reverted if needed.

If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.

See the owner's recent review activity for context:
https://android-review.googlesource.com/q/arcwang@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Ib6ec33ee0331fef36c7c048be5b588e275e8de4d
2025-02-20 07:50:43 -08:00
Treehugger Robot
bec906daaa Merge "Change range of battery saver schedule seekbar" into main am: a9d0f2b261
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3494973

Change-Id: I294958a408d7a3fe350364cd754539e64837668e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-20 04:00:44 -08:00
Treehugger Robot
a9d0f2b261 Merge "Change range of battery saver schedule seekbar" into main 2025-02-20 03:22:43 -08:00
Henrik Baard
37bf0fbe57 Change range of battery saver schedule seekbar
The minimum value which can be set as trigger for
Battery saver was changed from 10% -> 20% however the
settings UI was not aligned with this change.

ref: b0fe225 Update the battery saver scheduler minimum level

Update the UI to align with the minimum trigger
level.

Bug: 396444535
Test: manual, check minimum seekbar value after reboot.
Test: atest BatterySaverScheduleSeekBarControllerTest
Change-Id: I4baa766ff1cb78ce656ae340ce930094b9e124e0
2025-02-20 09:13:39 +01:00
Treehugger Robot
4afe48b684 Merge "Fix crash due to display name is not set to View." into main am: f31808e692
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3501106

Change-Id: Iefac0a42aa02ff26b0a6a780e9d00a106295cec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-19 20:38:39 -08:00
Treehugger Robot
f31808e692 Merge "Fix crash due to display name is not set to View." into main 2025-02-19 20:10:11 -08:00
tom hsu
58f40ebc7b Fix crash due to display name is not set to View.
Flag: EXEMPT bug fix
Fix: b/396700275
Fix: b/396606595
Test: manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:04006ccb4867a17e7e59c64327d102e9b30af5f9)
Merged-In: I2a70c4e31c182f99cc4fb3da93ce7911da005429
Change-Id: I2a70c4e31c182f99cc4fb3da93ce7911da005429
2025-02-19 19:18:06 -08:00
Steven Moreland
911a99932c 16KB -> 16 KB
To be consistent with our docs and communication elsewhere.

Bugs: me
Change-Id: I0233412e452a27a14eb14336b0229114d022183c
Test: N/A
2025-02-19 15:11:18 -08:00
Pawan Wagh
24a65ba02b Connect and enable root before running each testcase
- Enable16KbTest is flaky for aosp targets. Make sure that device
is connected and with root each time before and after running the
test.
- Add OWNERS file Enable16KbTest

Test: atest -c Enable16KbTest
Bug: 396984821
Change-Id: Ifffb73496b0947dda13a4022733677bd645b7e16
2025-02-19 20:59:06 +00:00
Owner Cleanup Bot
a51502b4fc Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/wifi/calling/OWNERS" into main am: 5c16cc9139
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3498934

Change-Id: I65fa211c27990261e5bfaf699dc3f3661c27330b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-19 06:58:45 -08:00
Owner Cleanup Bot
5c16cc9139 Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/wifi/calling/OWNERS" into main 2025-02-19 06:19:07 -08:00
Treehugger Robot
8971b66a8d Merge "Post 16KB notification for all users" into main am: 0414af8d0d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3494927

Change-Id: I19888c5dc377d54e6dd5d9ae3a64ff8e6ace616c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-18 17:20:34 -08:00
Treehugger Robot
0414af8d0d Merge "Post 16KB notification for all users" into main 2025-02-18 16:53:54 -08:00
Owner Cleanup Bot
105d03ae8a [owners] Remove bonianchen@google.com from src/com/android/settings/wifi/calling/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.

Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy.  We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain.  It can always be
reverted if needed.

If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.

See the owner's recent review activity for context:
https://android-review.googlesource.com/q/bonianchen@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Id0eb15daeefb919819a81e2d583ec3a10a38cb5b
2025-02-18 15:13:06 -08:00
Owner Cleanup Bot
833acfe497 [owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.

Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy.  We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain.  It can always be
reverted if needed.

If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.

See the owner's recent review activity for context:
https://android-review.googlesource.com/q/bonianchen@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: I4c8726b26469e9f8f986b2e54fe0a8edea21f246
2025-02-18 15:12:57 -08:00
Owner Cleanup Bot
e7f39e5b8f [owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.

Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy.  We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain.  It can always be
reverted if needed.

If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.

See the owner's recent review activity for context:
https://android-review.googlesource.com/q/bonianchen@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: I7dd96429039695468c84a638d37c7eca754ffc9d
2025-02-18 15:12:45 -08:00
Owner Cleanup Bot
c461f99ea4 [owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.

Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy.  We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain.  It can always be
reverted if needed.

If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.

See the owner's recent review activity for context:
https://android-review.googlesource.com/q/bonianchen@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: I0de09c3d6210d303b37df065f33d38fa3b9b093a
2025-02-18 15:12:32 -08:00
Pawan Wagh
64954821d3 Post 16KB notification for all users
PageAgnostic mode notification doesn't show up when
user switch happens. Post the notification for all users

Test: Enable16KB mode and switch users
Bug: 397319900
Change-Id: Ia32f42223075eb0d91034f82580c80b0879dda06
2025-02-18 22:09:14 +00:00
SongFerng Wang
fcdd8bb6d9 Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839abd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3448908

Change-Id: I765810619bbf6685ec5f08b0fd4a6d6b14c12e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-18 03:09:11 -08:00
SongFerng Wang
4dca839abd Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main 2025-02-18 02:37:57 -08:00
utzcoz
799e0e877a test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest
Rule should be public for junit.

Test: atest SettingsRoboTests:com.android.settings.applications.AppWithAdminGrantedPermissionsCounterTest

Merged-In: Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88

Change-Id: I2f577f71011e1197703e115b704af0aa1ee1e5dd
Signed-off-by: utzcoz <utzcoz@gmail.com>
2025-02-18 00:51:24 -08:00
Treehugger Robot
962cd2e8d8 Merge "Disable Reset app preference during the call." into main am: f7631498f1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3498088

Change-Id: I26d7efefb17009300631096118978ec872ea8fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-16 20:15:38 -08:00
Treehugger Robot
f7631498f1 Merge "Disable Reset app preference during the call." into main 2025-02-16 19:44:22 -08:00
Fan Wu
41bb05c7e9 Disable Reset app preference during the call.
Bug: 395750645
Test: manual
Flag: EXEMPT Bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c6544f991faf8dd1abb0855dd5dcacb08f028e04)
Merged-In: If64b6c878b2f793c6852d000d9d90dda18ef2420
Change-Id: If64b6c878b2f793c6852d000d9d90dda18ef2420
2025-02-16 19:05:41 -08:00
Pawan Wagh
ca9409db6d Merge "Check if device is online before starting 16kb test" into main am: 7ee0e07a50
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489997

Change-Id: I179833c4f14414ddd823136c061e4c6f21a21aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-14 11:22:23 -08:00
Pawan Wagh
7ee0e07a50 Merge "Check if device is online before starting 16kb test" into main 2025-02-14 10:40:31 -08:00
SongFerng Wang
4fec2b9e47 Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main am: 9dc07f4e19
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3481415

Change-Id: Ic6c9a18dcf9c51be64858caccada960f18f2a58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-02-12 19:18:18 -08:00
SongFerng Wang
9dc07f4e19 Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main 2025-02-12 18:51:11 -08:00
Pawan Wagh
4a55472cf3 Check if device is online before starting 16kb test
Test: atest -c Enable16KbTest
Bug: 390535191
Change-Id: I32cc404f8e84fba0e90ecb5b801d98908242292d
2025-02-11 22:39:38 +00:00