Xinyi Mao
428b124bea
Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174
Change-Id: I7068d880ab644f01dba523132dbccd2cc6ceff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 08:59:18 +00:00
Xinyi Mao
c51a3da148
Merge "Impl app anomlay preference" into udc-qpr-dev
2023-09-01 07:53:09 +00:00
mxyyiyi
c4fb17d740
Impl app anomlay preference
...
[ScreenShot]: https://screenshot.googleplex.com/BBrHTQbwbFHxZE9
Bug: 291689623
Bug: 291689643
Test: manual
Change-Id: Ia257f3ace4a2d71b2221f861be3e1238de6d791e
2023-09-01 06:40:36 +00:00
Allen Su
f8be5736a8
Merge "Add feature flag for LocaleNotification" into main
2023-09-01 05:30:03 +00:00
Chaohui Wang
6e7b06f18e
Clean up deprecated WifiSettings
...
Replace all references to NetworkProviderSettings.
Bug: 297036035
Test: robo test
Test: manual - on internet settings
Change-Id: I2a5ae5644042c982c2a284a303257896c20b7714
2023-09-01 13:24:29 +08:00
Chaohui Wang
ca4e47c348
Merge "Migrate WifiDialog2 to Kotlin" into main
2023-09-01 05:19:39 +00:00
Allen Su
ac54b70c85
Add feature flag for LocaleNotification
...
Bug: 248514263
Test: atest AppLocalePickerActivityTest LocaleListEditorTest
Change-Id: I0e2160d75bbac83a161c73c90624b0e7af5b0a8e
2023-09-01 03:24:58 +00:00
Chaohui Wang
b1ecd0e392
Migrate WifiDialog2 to Kotlin
...
Bug: 297036035
Test: unit test
Test: manual - on wifi dialog
Change-Id: I5bcd636705b8514fe3fd784ef380f55e079c6ce7
2023-09-01 11:15:14 +08:00
Priyanka Advani
7b4cfbca95
Merge "Revert "Remove Winscope tracing QS development tile"" into main
2023-09-01 03:14:34 +00:00
Zaiyue Xue
30141ada64
Fix b/298551473: Battery usage robotest failed in main branch
...
Bug: 298551473
Fix: 298551473
Test: presubmit
Change-Id: I37a990003293bdfa0eb97e79c0ce7af2069d10bb
2023-09-01 11:11:17 +08:00
Vlad Popa
4ee43c40e9
Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690
Change-Id: I134714c9a5cb03c06d6dbee2256d7630554c37c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 00:44:41 +00:00
Diwas Sharma
e08ceb575c
Revert "Remove Winscope tracing QS development tile"
...
This reverts commit 513e014963
.
Reason for revert: 298512106
Change-Id: I5efa947b17b8d33cfe8ca3350c2279903e5239af
2023-09-01 00:41:22 +00:00
Vlad Popa
4010b222f8
Merge "Disable the spatializer options for device categories" into udc-qpr-dev
2023-09-01 00:33:47 +00:00
Kean Mariotti
698657dead
Merge "Remove Winscope tracing QS development tile" into main
2023-08-31 22:06:52 +00:00
Holly Sun
0ec3b5035b
Move ShadownDeviceConfig.java to tests/robotests/testutils.
...
This is to solve the presubmit issue of ag/24543390.
Bug: 294858168
Test: build
Change-Id: I40c2ed7134676490d52aa63189dc16b3a7668a71
2023-08-31 21:07:25 +00:00
Vlad Popa
0127c488e4
Merge "Disable the spatializer options for device categories" into main
2023-08-31 20:48:06 +00:00
Xin Li
f8a0c0323f
Merge UP1A.230905.019
...
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Change-Id: I2a988e3da0958f31323f95588e1ac66482186ecf
2023-08-31 12:31:10 -07:00
Vlad Popa
5175cdc2f5
Disable the spatializer options for device categories
...
If the BT device cannot be of category headphones do not show the
spatializer options.
Test: manual & atest BluetoothDetailsSpatialAudioControllerTest
Bug: 297265575
Merged-In: I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e
Change-Id: I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e
2023-08-31 09:48:49 -07:00
Vlad Popa
92fb7bddbf
Disable the spatializer options for device categories
...
If the BT device cannot be of category headphones do not show the
spatializer options.
Test: manual & atest BluetoothDetailsSpatialAudioControllerTest
Bug: 297265575
Change-Id: I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e
2023-08-31 09:48:39 -07:00
Massimo Carli
70ca63e4a2
Enable User Aspect Ratio Settings by default
...
Fix: 298203770
Test: Manual
Change-Id: I55daa03ab4369fef62ba439f4cf8af211f136021
2023-08-31 16:46:39 +00:00
Behnam Heydarshahi
2329c823ab
Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev am: a5b314b90f
am: e16000bbae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24005152
Change-Id: I925cca06a0fc7907f032448ab02411028f421000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 15:31:35 +00:00
Behnam Heydarshahi
e16000bbae
Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev am: a5b314b90f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24005152
Change-Id: I6cd38f69c8ddaaa02119a12ffb6f1f26ec34e5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 14:38:13 +00:00
Behnam Heydarshahi
a5b314b90f
Merge "TalkBack: Clarify volume panel slice action label" into udc-qpr-dev
2023-08-31 13:40:55 +00:00
Yiyi Shen
cd1538ba5a
Merge "Add Fast Pair devices "See all" page." into main
2023-08-31 10:37:09 +00:00
Yiyi Shen
b7c914dc9f
Add Fast Pair devices "See all" page.
...
Bug: 296507968
Test: FastPairDeviceGroupControllerTest
Change-Id: I3939f65ac9262673d99e7041df5b9dc04bd43722
2023-08-31 17:07:41 +08:00
Chaohui Wang
7f72bcf667
Merge "Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub" into main
2023-08-31 07:07:48 +00:00
Ram Peri
467378309c
Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6
am: cc1d59b3b9
am: eb446ca146
am: acbb1b5560
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384
Change-Id: I35b73073058eebae562796a0f1eaab0c452b348b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 17:27:11 +00:00
Ram Peri
acbb1b5560
Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6
am: cc1d59b3b9
am: eb446ca146
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384
Change-Id: I0b5d81f67979bcb0fc5377e620d8be96059151a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 16:51:10 +00:00
Ram Peri
eb446ca146
Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6
am: cc1d59b3b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384
Change-Id: I8a7e3f2a148ec25b5f0b358d5c609e0f551ed5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 16:03:43 +00:00
Ram Peri
cc1d59b3b9
Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384
Change-Id: Ie747b6771b59f48fbb82c416580e823a117d984b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-30 15:14:08 +00:00
SongFerng Wang
8007efdbff
Skip Data usage in Settings Widgets
...
- Do not show data usage in Settings Widgets if the device does not support sim or there is the User Restricted of mobileMobileNetwork.
Bug: 292998280
Test: Manual test
[pass]make RunSettingsRoboTests ROBOTEST_FILTER=CreateShortcutPreferenceControllerTest
Change-Id: I3984a43dc67e9efa92d06a4644b18d1799d56824
2023-08-30 17:48:53 +08:00
Ram Peri
3c31a95f16
Fix META-INF for settings library to match robolectric
...
Test: atest SettingsRoboTests:com.android.settings.biometrics.fingerprint2.fragment.FingerprintEnrollmentIntroFragmentTest
Bug: 294753198
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:88a9d3faa2b04cf508472e10489eb515cef65bdc )
Merged-In: I2711538ff9c2a18f3cad80e384d0281b119cb94a
Change-Id: I2711538ff9c2a18f3cad80e384d0281b119cb94a
2023-08-30 02:05:44 +00:00
Ram Peri
88a9d3faa2
Fix META-INF for settings library to match robolectric
...
Test: atest SettingsRoboTests:com.android.settings.biometrics.fingerprint2.fragment.FingerprintEnrollmentIntroFragmentTest
Bug: 294753198
Change-Id: I2711538ff9c2a18f3cad80e384d0281b119cb94a
2023-08-29 19:03:20 -07:00
SongFerng Wang
aba1cb6ae5
Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev am: 32c75f49a7
am: 69ea8a2adc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24548405
Change-Id: I2fa673e9c0314d045cbe59e7b743403ee6231be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 21:39:37 +00:00
Joshua McCloskey
d084f6a61f
Fixed formatting
...
Test: N/A
Change-Id: If450b64f8709b65f1e5d0c7cb2e177d8ca1a89aa
2023-08-29 18:39:40 +00:00
Weng Su
09f9de899f
Show Hotspot informations in Network details settings am: 36ae9189b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24573848
Change-Id: Icc16b788667e9938df601b504c98a6baca5962ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 18:20:46 +00:00
Yiyi Shen
de231200d7
Add FeatureProvider for FastPair Settings integration.
...
Bug: 296507968
Test: FakeFeatureFactory
Change-Id: Ie2e238cb61ca56a1d19e1a13b0234e28e28a785e
2023-08-29 15:50:48 +08:00
Treehugger Robot
10d3e1e065
Merge "Enable i18n for battery tips card and fix b/297036263." into udc-qpr-dev-plus-aosp
2023-08-29 06:26:39 +00:00
Chaohui Wang
88343a3d7c
Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub
...
Because,
- telephonyManager.mergedImsisFromGroup is @NonNull
- telephonyManager.mergedImsisFromGroup is fixed, will not return null
- This test no longer feasible, since return null will crash now
Bug: 297923588
Test: atest SettingsSpaUnitTests
Change-Id: Ic09cd9b5a36a4743a65e05105ce2e814c020491f
2023-08-29 13:02:53 +08:00
SongFerng Wang
69ea8a2adc
Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev am: 32c75f49a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24548405
Change-Id: I039187faf0a705b68509a241781f59f1e4c8c4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-29 04:59:49 +00:00
Weng Su
36ae9189b2
Show Hotspot informations in Network details settings
...
- Show Hotspot device type in hearder icon
- Show Hotspot device details informations.
- Internet source (network type)
- Battery
Bug: 297346368
Test: manual test
atest -c WifiNetworkDetailsFragmentTest \
WifiDetailPreferenceController2Test
atest -c SharedConnectivityRepositoryTest \
WifiNetworkDetailsViewModelTest
Merged-In: I4bd090e00681911c8fac469289fd818237b8c518
Change-Id: I4bd090e00681911c8fac469289fd818237b8c518
2023-08-29 03:56:11 +00:00
Weng Su
d32f590f07
Merge "Show Hotspot informations in Network details settings" into main
2023-08-29 03:55:12 +00:00
SongFerng Wang
32c75f49a7
Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev
2023-08-29 03:53:48 +00:00
Zaiyue Xue
ab00ac091d
Enable i18n for battery tips card and fix b/297036263.
...
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
Merged-In: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
(cherry picked from commit d3156cc001
)
2023-08-29 03:38:35 +00:00
Treehugger Robot
696c8ff64a
Merge "Skip test broken by @NonNull annotation fix" into main
2023-08-29 00:43:23 +00:00
Colin Cross
4700dd261f
Skip test broken by @NonNull annotation fix
...
b/294110802 fixed the @NonNull annotation so that it was visible to
kotlin when applied to methods outside the current build module. This
caused kotlin to insert more null checks, which broke a test that was
mocking a method annoated with @NonNull and forcing it to return null.
Add @Ignore to the test for now.
Bug: 294110802
Bug: 297923588
Test: atest SettingsSpaUnitTests
Change-Id: I86a677c5ac01bcfaeebe8c339791cca5b2b97fc7
2023-08-28 15:36:09 -07:00
Weng Su
25e20caf00
Show Hotspot informations in Network details settings
...
- Show Hotspot device type in hearder icon
- Show Hotspot device details informations.
- Internet source (network type)
- Battery
Bug: 297346368
Test: manual test
atest -c WifiNetworkDetailsFragmentTest \
WifiDetailPreferenceController2Test
atest -c SharedConnectivityRepositoryTest \
WifiNetworkDetailsViewModelTest
Change-Id: I4bd090e00681911c8fac469289fd818237b8c518
2023-08-29 04:06:55 +08:00
SongFerng Wang
9ca09c3494
Merge "Fix the NullPointerException" into udc-qpr-dev am: acd7bbefd1
am: 6058a62ad7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24523908
Change-Id: Ia3126898342da4f39f9431a423f25a6270ae3107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-28 19:19:55 +00:00
Julia Reynolds
67c2cf714b
Fix failing test
...
Test: make -j RunSettingsRoboTests ROBOTEST_FILTER=NotificationAssistantPreferenceControllerTest
Fixes: 296531083
Change-Id: If949a76662aab6aa63e6ca793d9349254ce688e9
2023-08-28 18:19:21 +00:00
SongFerngWang
7f62ae77dc
Fix ClassCastException at NetworkSelectSettings
...
Bug: 296172317
Test: atest NetworkSelectSettingsTest
Change-Id: I811ef95f679bb1b0235a335320654c2acd68110c
2023-08-28 19:17:10 +08:00