Commit Graph

138951 Commits

Author SHA1 Message Date
Yuanru Qian
8303a38d10 Merge "Remove ex-team members from OWNERS" into main 2024-07-24 10:06:07 +00:00
Yuanru Qian
3fac9ad21b Remove ex-team members from OWNERS
Change-Id: I025d4963e5b63a28fb0fe36df8a4e1fdd76a9b3d
2024-07-24 09:41:31 +00:00
Ram Peri
71b2be5571 Merge "Robolectric upgrade" into main 2024-07-23 00:28:56 +00:00
Ram Peri
f5b58ea3be Robolectric upgrade
Test: atest SystemUIGoogleRoboRNGTests
Flag: TEST_ONLY
Change-Id: I833ac67223875480994f947907754290bb25c946
2024-07-22 13:48:09 -04:00
SongFerng Wang
14393a5f06 Merge "Fix SmartForwardingActivity crash at screen rotation" into main 2024-07-19 05:41:40 +00:00
SongFerng Wang
9befb6cd8f Merge "Settings: Adapt edge-to-edge enforcement" into main 2024-07-18 09:31:55 +00:00
Tom Hsu
f20f297cfa Merge "Fix network can't handle simultaneously SS request for both subs" into main 2024-07-17 06:56:04 +00:00
Edgar Wang
969c26392d Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main 2024-07-17 00:53:02 +00:00
Tetiana Meronyk
c641849a42 Add Multiuser team to the OWNERS file for users package in Settings
Bug: 352721898
Change-Id: Ica47025c4ba5033a15422931fd9f8ed85ae97e9e
Test: N/A
2024-07-16 12:05:25 +00:00
Treehugger Robot
9a492ca3cb Merge "Repost PageAgnostic mode notification when dismissed" into main 2024-07-09 17:27:16 +00:00
Treehugger Robot
a02b1c3aa2 Merge "Settings: fix unexpected routing selection" into main 2024-07-05 06:46:04 +00:00
hoffc
99e33291d3 Settings: fix unexpected routing selection
setRouterGroupId in WifiDisplayPreferenceController will result in unexpected routing selection in MediaRouter, which will lead to WFD scanning not be triggered when entering WFD settings page if there is one remembered WFD device exists before reboot.

Remove the set group id call.

Bug: 351110755

Change-Id: I0d434543338d9896116541963f31e4669d877ea8
2024-07-04 09:02:23 +00:00
Pawan Wagh
86a9e06419 Repost PageAgnostic mode notification when dismissed
Device is in experimental mode when using 16kB developer option.
When the notification is dimissed, repost it again.

Bug: 351029724
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: Ie579b6c4dd060b165c6cc8ae635d48e257d49bec
2024-07-03 22:00:45 +00:00
Alina Zaidi
ed9bccb0b3 Merge "Update OWNERS for DesktopModePreferenceController" into main 2024-07-03 16:42:23 +00:00
Alina Zaidi
a059eabdb3 Update OWNERS for DesktopModePreferenceController
Change-Id: I446525a06480a27f80e530c65181fd31f43a9ef8
Test: N/A
Flag: EXEMPT Ownership cannot be flagged
2024-07-03 16:22:23 +00:00
Pawan Wagh
b6fc7a6f58 Merge "Fix flaky test for persistent notifications" into main 2024-07-03 15:14:25 +00:00
SongFerng Wang
5462789fae Merge "Fix AppBatteryPreferenceTest flaky" into main 2024-07-03 09:34:52 +00:00
Pawan Wagh
999b8a9f33 Fix flaky test for persistent notifications
Persistent notifications test sometimes fails due
to setup activity doesn't exit due to failed intent.
Adding setup exit command when on device tests are starting and
adding timeout for transition.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Bug: 349820489
Change-Id: Iaf1c1f481612367bbce919b27e89f88a24abb582
2024-07-02 23:57:57 +00:00
Chaohui Wang
6a6a263177 Fix AppBatteryPreferenceTest flaky
Bug: 350448913
Test: unit test
Merged-In: I5a1753835d2d47712ea249081c9a77c455eb3291
Change-Id: I5a1753835d2d47712ea249081c9a77c455eb3291
2024-07-02 23:28:49 +00:00
Treehugger Robot
ce20ff98e3 Merge "Fix UI issues in localization" into main 2024-06-28 22:04:35 +00:00
Qiang Chen
9507c61155 Settings: Adapt edge-to-edge enforcement
Android 15 enables edge-to-edge by default. WI-FI info should do the
adaptation, or not some UIs may be obscured by system bars.

Apply window insets for WifiConfigInfo and WifiStatusTest activity
content layout.

Bug: 340713923
Test: Manaul

Change-Id: Iecaadfa1be55544809b240df9c2097e3b4d053f9
2024-06-28 12:44:24 +05:30
Pawan Wagh
234872e187 Fix UI issues in localization
- Some of the locales don't display entire text and BigTextStyle doesn't
display ellipsis for them. Removing bigText.
- Fixing strings to display 4KB
- Reduce string for bootloader unlock title

Bug: 345291007
Bug: 343893991
Bug: 343815951
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: I3e5bf9bf70be1240cfe7d3a381bb8fef62ce2efa
2024-06-27 19:49:38 +00:00
Jason Chiu
d78409d41f Merge "Allow the background activity start from legacy suggestion cards" into main 2024-06-27 04:14:16 +00:00
Jason Chiu
361020dfdc Allow the background activity start from legacy suggestion cards
There's a restriction on starting activities from PendingIntents. Opt-in
required when starting activities from PendingIntents. (https://goo.gle/android-bal#opt-in-required)

Bug: 346690654
Change-Id: I0525ebe5a49e7a7f5b07236e01cd3ababce1da4d
Test: manual
2024-06-26 08:54:21 +00:00
J. Eason
2c4ceb385f Merge "Update the icon for the adb wireless pairing code preference." into main 2024-06-18 14:14:29 +00:00
J. Eason
b5a82c2f91 Update the icon for the adb wireless pairing code preference.
The new icon is more specific to adb wireless pairing and will now react correctly to system theme accent color changes.

Bug: 347710454

Change-Id: I7bd25661b2dda83403b41c7ebdf1941437d1d0f8
2024-06-18 07:58:12 +00:00
Treehugger Robot
c07341d522 Merge "Fix SubscriptionInfoListViewModelTest" into main 2024-06-18 07:51:53 +00:00
Chaohui Wang
e01855dcdb Fix SubscriptionInfoListViewModelTest
Fix: 329160337
Test: unit test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:10f5bdabb468b806d634a2b9061b9908b2e8d430)
Merged-In: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
Change-Id: I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0
2024-06-18 06:59:56 +00:00
Kevin Liu
76d7864bc6 Merge "Add strict_mode: false" into main 2024-06-18 03:07:47 +00:00
Xin Li
87973cf893 Merge "Merge Android 14 QPR3 to AOSP main" into main 2024-06-17 18:51:35 +00:00
Xin Li
ef55516656 Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In: If518bbb88342ae4c2e5e9f131727de58446be780
Change-Id: I4384e446922d66808c73cbf52627f2e8db7fa7af
2024-06-13 10:50:27 -07:00
Pawan Wagh
cb7bd9dd74 Merge "Move Enable16KbTest to device-tests" into main am: df6affdc3d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3123771

Change-Id: If518bbb88342ae4c2e5e9f131727de58446be780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 01:27:02 +00:00
Pawan Wagh
df6affdc3d Merge "Move Enable16KbTest to device-tests" into main 2024-06-12 01:10:40 +00:00
Pawan Wagh
3aa1405acb Move Enable16KbTest to device-tests
general-tests are not configured for the devices
which should be tested. Moving test to device-test suite.

Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 345763025
Change-Id: I01abf4ec91c4f7b588de12ac9cb71b805849e4ac
2024-06-10 21:19:27 +00:00
Treehugger Robot
95da1e4de2 Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ibb00cb80a1d0c34a5a73f26b21ebe212692fc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 08:56:58 +00:00
Treehugger Robot
1bb8e28762 Merge "Fix NPE force close if disabling BT feature" into main 2024-06-07 08:35:48 +00:00
hoffc
de3f413ecd Fix NPE force close if disabling BT feature
adapter can be null in some SPs which disable bluetooth feature
from framework, so it will lead to NPE force close in these SPs.

Add null check for adapter.

Bug: 345584461

Change-Id: I3fabe94a97cc9baf7b1739fe1c9160a52b50d7d4
2024-06-07 13:00:03 +08:00
Xin Li
9bf082ae01 Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:42 +00:00
Julie Pan
33e2eb32fa Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main am: ce2a5e07e2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118591

Change-Id: I46352b557bef347fd55d89c0fbdd29d87d52c1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 19:54:52 +00:00
Julie Pan
ce2a5e07e2 Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main 2024-06-06 19:25:25 +00:00
Owner Cleanup Bot
88ab066a66 Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote CR -1 and the bot
will abandon it. Vote CR +1/2 to approve this change.

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

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

Change-Id: I8563f73848a4e32ff3da4b1eaf34253374d9012c
2024-06-06 17:47:53 +00:00
Treehugger Robot
8c0d308276 Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923

Change-Id: I374aa31dde3f310e30462e82422dca679274ebee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 16:47:02 +00:00
Treehugger Robot
c3c33df4fc Merge "Add Enable16KbTest to TEST_MAPPING" into main 2024-06-06 16:28:25 +00:00
Treehugger Robot
cd33904187 Merge "Fix test config" into main am: 4f19466f56
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506

Change-Id: I96194603f06e24effecbbf3f04cbea01e21e7c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 15:46:18 +00:00
Treehugger Robot
4f19466f56 Merge "Fix test config" into main 2024-06-06 15:35:07 +00:00
SongFerng Wang
5a979e94a8 Merge "Show cdma network mode choices" into main am: 392f07f415
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999

Change-Id: I61a5556361fe2109864b6e7e10d47e081930d13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 14:24:26 +00:00
SongFerng Wang
392f07f415 Merge "Show cdma network mode choices" into main 2024-06-06 14:07:58 +00:00
Pawan Wagh
9021526247 Fix test config
test app was failing to install when running in integration due to
shared uid. Removing the sharedUid field from test.

Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374

Change-Id: I37f481c552f8f0779bcd8c69cf4e40598590f5db
2024-06-05 23:02:50 +00:00
Xin Li
3c3a1cc6c6 Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: Id3d79805bb2289b84ad34ac05a97e50f0410502f
Change-Id: I70f531e800ed5f3765a100b5b5cecb99664c1dbc
2024-06-05 14:12:13 -07:00
Pawan Wagh
78cd8ba4f6 Merge "Integration tests for 16kb dev option" into main am: 3abf3a0f8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111722

Change-Id: I1a9980d2857017bfd3d6808561b020bfa35dd32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 03:08:45 +00:00