Fan Wu
d93efafd95
Remove unneeded cast to SettingsActivity
...
This is a prerequisite for using upcoming Catalyst integration test
Bug: 372774754
Test: atest
Flag: EXEMPT minor update
Change-Id: I4809df8d06f0c3d2de1c10d17e997ff80a8d4086
2024-10-16 08:02:03 +00:00
Treehugger Robot
22aebb7599
Merge "Add MaterialComponents.DayNight to SearchBarStyle" into main am: 71c59bae9c
am: fa97f902d7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3252493
Change-Id: I283b32631c3184011cdc6c684e266740b3963c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-16 07:26:35 +00:00
Treehugger Robot
fa97f902d7
Merge "Add MaterialComponents.DayNight to SearchBarStyle" into main am: 71c59bae9c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3252493
Change-Id: I4f85371e9ebe33b896192e4f47e033dee1592a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-16 07:07:04 +00:00
Treehugger Robot
71c59bae9c
Merge "Add MaterialComponents.DayNight to SearchBarStyle" into main
2024-10-16 06:51:55 +00:00
Jacky Wang
d74c4d3cb8
Merge "Enable catalyst test for NetworkDashboardScreenTest" into main
2024-10-16 06:51:34 +00:00
Jacky Wang
085a623171
Merge "Remove isCatalystEnabled check from SoundSettings" into main
2024-10-16 06:51:28 +00:00
Chaohui Wang
a088e4c6c5
Clean up getNetworkTypeFromRaf()
...
And also getRafFromNetworkType()
Use the version in android.telephony.RadioAccessFamily instead.
Bug: 373771849
Flag: EXEMPT refactor
Test: manual - on sims settings
Test: unit tests
Change-Id: I09a3d6a4cdfb9844a92ad8f0507b03b08ce91f27
2024-10-16 14:23:55 +08:00
Xinyi Mao
700f7e9ab2
Merge "Take as Unrestricted Mode in the UI if current Mode is Unknown." into main
2024-10-16 05:58:28 +00:00
mxyyiyi
1b83703adc
Use BatteryOptimizeUtils to add packageName into PowerSaveWhitelistUserApps allowlist, which will set app into Unrestricted Mode
...
Bug: 372831500
Test: test manually by app "Baidu Cloud"> auto-backup settings > add into battery allowlist.
Flag: EXEMPT for simple fix
Change-Id: I225ff0a04db3b5863ab32920511f42fbc02440dc
2024-10-16 13:39:51 +08:00
Treehugger Robot
a876deec66
Merge "Fix name of COO." into main
2024-10-16 04:36:50 +00:00
Jacky Wang
42d2b08454
Remove isCatalystEnabled check from SoundSettings
...
Bug: 360015496
Flag: EXEMPT N/A
Test: atest SoundScreenTest
Change-Id: I3b392d009eaaf59ee77a1ea9951a7191fcc521d5
2024-10-16 12:22:42 +08:00
Jacky Wang
c04e468bd4
Enable catalyst test for NetworkDashboardScreenTest
...
Bug: 368355361
Flag: EXEMPT test only
Test: atest NetworkDashboardScreenTest
Change-Id: I06630abf88f833e69e4d28419f3ba9f6a2a355f3
2024-10-16 12:19:17 +08:00
Joshua McCloskey
d9c83e350b
Added error message to error state.
...
This allows for further customization of string error messages when
needed.
Bug: 365565482
Flag: EXEMPT not needed
Test: manual
Change-Id: I57d6e7b09530bd810518e4154001140c5debfd6c
2024-10-16 04:04:34 +00:00
Yuchen
5951efefd7
Fix name of COO.
...
Test: visual
Bug: 370850767
Flag: EXEMPT bug fix
Change-Id: I41931b49e993806cc3de71c67f600faee2af241d
2024-10-16 03:21:12 +00:00
Joy Babafemi
2fbff9b6da
Fix missing open button under preferred service in credman settings screen
...
Bug: 368690798
Test: manual test
Flag: EXEMPT minor xml changes
Change-Id: I27047b4e27f171436d96cff5bba1364053dcaa7a
2024-10-16 03:00:47 +00:00
Robin Vinterbladh
dc419524c5
Add MaterialComponents.DayNight to SearchBarStyle
...
When opening the Settings app or changing colors in ThemePicker
there are tons of warnings with UnsupportedOperationException in
the log. These logs are related to the
LayoutInflater attempting to inflate a MaterialCardView and
TypedArray#getColor where it expects the colors to be either an integer
color or a color state list. This happens every time you re-start
Settings.
To enable layout inflater finding colors for Settings we add a
MaterialComponents theme to SearchBarStyle, this makes sure that
TypedArray#getColor gets an integer color instead of relying on
framework to solve this.
Flag: NA
Bug: 363970601
Test: manual, open Settings and check the logs
Change-Id: I728c1537537bb4d32af6006800de93e64facfa8e
2024-10-16 01:05:12 +00:00
Treehugger Robot
c0b6e0bd4b
Merge "[Catalyst] Vibration and haptics screen migration" into main
2024-10-16 00:43:14 +00:00
Guojing Yuan
a287a4644e
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: 9d5bbc8e9b
-s ours am: 8d5e11d9d8
-s ours am: 444c871412
-s ours am: 613f019fb2
-s ours am: bd461d807e
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: Ia104514d71b208914c3527602bb5fdf57af81b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 21:01:17 +00:00
Guojing Yuan
c2cd5b5351
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: ab697f3776
-s ours am: 5c59d451ac
-s ours am: aa43306ed8
-s ours am: 39d6677be3
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I64b4680f39e14265cda67b6456830b5abc45d559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 21:01:02 +00:00
Guojing Yuan
bd461d807e
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: 9d5bbc8e9b
-s ours am: 8d5e11d9d8
-s ours am: 444c871412
-s ours am: 613f019fb2
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I752668ef93c9b70cf0c103f88429b10a0edbfabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:22:05 +00:00
Guojing Yuan
39d6677be3
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: ab697f3776
-s ours am: 5c59d451ac
-s ours am: aa43306ed8
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: Ic97e5660be665dbac4253ff4c2f6d41fd2764c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:21:53 +00:00
Guojing Yuan
d2b68804d3
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: 9d5bbc8e9b
-s ours am: 8d5e11d9d8
-s ours am: 444c871412
-s ours am: fb813e451a
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I417e7e577d3361b8018fb8a709e6d204df85f1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:21:52 +00:00
Guojing Yuan
23914c8a5a
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: ab697f3776
-s ours am: 5c59d451ac
-s ours am: f23d6835d9
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I1945fba42ff71421ddbdc81e489dcdb805a01b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:21:38 +00:00
Guojing Yuan
613f019fb2
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: 9d5bbc8e9b
-s ours am: 8d5e11d9d8
-s ours am: 444c871412
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I210384ce88bc3586e0ef50e8c1d2f803c6ba4198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:15:10 +00:00
Guojing Yuan
fb813e451a
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: 9d5bbc8e9b
-s ours am: 8d5e11d9d8
-s ours am: 444c871412
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: Ib02afdae32996f315caf5e300afd0f56e6a9d9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:08:41 +00:00
Guojing Yuan
f23d6835d9
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: ab697f3776
-s ours am: 5c59d451ac
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I7a6f80fb16ad53037b85c06722153029cce1110e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:08:25 +00:00
Guojing Yuan
444c871412
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: 9d5bbc8e9b
-s ours am: 8d5e11d9d8
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I8c1abdad66ca8be3644ea67dde1cd77a87044a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:08:15 +00:00
Guojing Yuan
aa43306ed8
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: ab697f3776
-s ours am: 5c59d451ac
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I8c3d9d575f6d0caf9e3810cec5f1b9ef7965650e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 20:08:02 +00:00
Treehugger Robot
627538e100
Merge "Add piano and remove tent from zen icon picker" into main
2024-10-15 19:52:29 +00:00
Guojing Yuan
5c59d451ac
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: ab697f3776
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I8edbacc880f6e6a1c99c71d3394774175817a5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 19:50:39 +00:00
Guojing Yuan
8d5e11d9d8
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours am: 9d5bbc8e9b
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I7fa4e6833e674e1fdc6d000cddd5a3235837271c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 19:50:11 +00:00
Guojing Yuan
9d5bbc8e9b
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: Iae70fb15fcd0613f74d0b23f351d9f5eba8a76fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 19:30:28 +00:00
Guojing Yuan
ab697f3776
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours am: d4a01ee0db
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I5cd6560809682c31f1255d4d852c01ac650f45f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 19:30:28 +00:00
Guojing Yuan
d4a01ee0db
[automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
am: c45030ba4b
-s ours
...
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I355a696d03b58ea53a4a4a0485878d14eee2314c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 19:00:44 +00:00
Guojing Yuan
c45030ba4b
[CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
am: 268575fb3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: Id7576ad8435bf12972833f0ed056a6edf991b77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 18:45:15 +00:00
Guojing Yuan
268575fb3a
[CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I26b92140443f28084cb514da60e1febcf599dfc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 18:25:14 +00:00
Guojing Yuan
59cdc3e20c
[CDM][NLS] Check if the NLS service has an intent-filter
...
Bug: 363248394
Test: CTS
Flag: EXEMPT bugfix
Change-Id: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
Merged-In: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
(cherry picked from commit 7ae59a42eb
)
2024-10-15 17:14:05 +00:00
Marcus Ge
3ba451c4a3
Merge "[Contrast] Fix checkmark in RTL" into main
2024-10-15 17:09:38 +00:00
Riley Jones
8e0443822a
Merge "Cleanup searchable items on Accessibility > System controls" into main
2024-10-15 16:52:04 +00:00
Alexander Roederer
36343c7358
Add piano and remove tent from zen icon picker
...
Bug: 372366178
Test: atest IconOptionsProviderImplTest + manual
Flag: android.app.modes_ui
Change-Id: Ic777cc4314014bca7b422244ed8861d09c8a3969
2024-10-15 16:18:49 +00:00
Treehugger Robot
07bcb127dd
Merge "Clean up 24Q3 aconfig flag reset_mobile_network_settings" into main
2024-10-15 16:10:40 +00:00
Haijie Hong
068ac9d264
Merge "Fix multi-toggle flicker bug" into main
2024-10-15 14:50:12 +00:00
Jacky Wang
49677b7af2
Merge "[Catalyst] Network and Intenet screen migration" into main
2024-10-15 13:26:29 +00:00
Treehugger Robot
d5758d60d7
Merge "Fix flaky tests due to shared system property" into main
2024-10-15 12:09:31 +00:00
Jacky Wang
3ab6b197a9
Fix flaky tests due to shared system property
...
The system property is shared within JVM, change system property in a
test case might break test cases in another test class. To address the
issue, introduce SystemProperty helper class to back up and restore the
system properties in tests.
Bug: 373177618
Flag: EXEMPT Test only
Test: atest SettingsRoboTests
Change-Id: I15539ce5ac425f35571d796baa25f259df1b601f
2024-10-15 19:08:30 +08:00
Jason Chiu
9c9c0a3d94
[Catalyst] Network and Intenet screen migration
...
- Add a flag for the migration
- Add the skeleton of the screen
Test: atest NetworkDashboardScreenTest
Bug: 368355361
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Change-Id: I37622d318f2a52a7c60c9fa965b94fd135ce0b60
2024-10-15 18:32:31 +08:00
mxyyiyi
7bfa060c5f
Take as Unrestricted Mode in the UI if current Mode is Unknown.
...
- Battery usage mode MODE_UNKNOWN is (1) apps in allowlist and (2) app's OP_RUN_ANY_IN_BACKGROUND = MODE_IGNORED.
For this case, mode should be displayed as Unrestricted on UI since it is in allowlist; and should be logged as unknown mode for the potential compatibility issues.
- After Backup & Restore, the MODE_UNKNOWN will be reset to Optimized(Default) Mode on target device.
Bug: 372831500
Test: manual
Test: atest BatteryOptimizeUtilsTest
Test: atest AppOptModeSharedPreferencesUtilsTest
Flag: EXEMPT for simple fix
Change-Id: Ic18e026f71a4a50ffa1711e2ca0782aeb8b33076
2024-10-15 15:53:29 +08:00
Haijie Hong
7a3baf7d2e
Fix multi-toggle flicker bug
...
BUG: 343317785
Test: local tested
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ib5e700412c112ff6fa19b54f341fbd598c6b345c
2024-10-15 14:49:25 +08:00
Mill Chen
b923194def
[Catalyst] Vibration and haptics screen migration
...
- Add a flag for vibration and haptics migration
- Add skeleton of vibration and haptics
Bug: 368360218
Test: atest VibrationIntensityScreenTest
Flag: com.android.settings.flags.catalyst_vibration_intensity_screen
Change-Id: I0117f570fe9bf92e61974984d00c0bd5be684fff
2024-10-15 04:44:09 +00:00
Dongzhuo Zhang
17476190b7
Merge "Add ContactsStorageSettingsActivity to handle the android.provider.action.SET_DEFAULT_ACCOUNT intent" into main
2024-10-15 04:26:06 +00:00