Jason Hsu
631427bb08
Merge "[Audio routing] Add strings for audio routing page for Android U"
2022-12-07 14:23:33 +00:00
Jason Hsu
478b6f3d89
Merge "[Hearing devices page] Add strings for hearing devices page for Android U"
2022-12-07 14:23:00 +00:00
João Victor Mendes Freire
16a10ba0a1
Merge "Fix user avatar not being set on rotation"
2022-12-07 13:49:32 +00:00
João Victor Mendes Freire
d97f27b816
Merge "Fix user not being redirect to user details page"
2022-12-07 13:49:21 +00:00
João Victor Mendes Freire
6754d52673
Merge "Fix settings crash on users page on config change"
2022-12-07 13:49:08 +00:00
Bonian Chen
7b06d5f0e1
[Settings] BT and WiFi reset menu might covers VPN
...
VPN would be reset by BT and WiFi reset menu under device without a SIM
available.
Bug: 260034791
Test: local and auto
Change-Id: I3c66cd629977cc11172758ebbe314167b5220419
2022-12-07 13:45:51 +00:00
Zaiyue Xue
4b14c49dfb
Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced.
...
Bug: 256123455
Test: presubmit
Change-Id: Ia22eb8d11836b9b0d8ab74f4760e81966040a947
2022-12-07 20:47:44 +08:00
Rupesh Bansal
bc255db77a
Remove VR features from apps
...
Bug: 260555143
Test: atest com.android.server.power
Change-Id: I7d1938363dacb06f93cea69672a710ccbb76012e
2022-12-07 12:30:30 +00:00
Weng Su
a88c064842
Check multiple security types for Wi-Fi NetworkRequest
...
- The WifiEntry already support multiple security types simultaneously from framework
- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods
- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
- WifiEntry: getSecurity:WPA2 // getSecurityTypes:{WPA2, WPA3}
- ReqeustNetwork: getSecurity:WPA3
- Need to use getSecurityTypes to check for matching WifiEntry
Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest
Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
2022-12-07 20:09:28 +08:00
TreeHugger Robot
f17d3c4697
Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"
2022-12-07 11:47:43 +00:00
TreeHugger Robot
2e8dc1c49f
Merge "Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()"
2022-12-07 11:24:15 +00:00
Bonian Chen
d73c751f3d
Merge "[Settings] Code refactor for performance"
2022-12-07 10:25:49 +00:00
Zoey Chen
a8f0151a1b
[automerger skipped] Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24
am: 8b0070a509
am: 45c646d6cb
-s ours
...
am skip reason: Merged-In I07bf9a8f59ea14fc8133e2473746a59a5c187d47 with SHA-1 3eaadf598f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882
Change-Id: If2c47c775d58c40c23655e50020ec0c258052038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 10:17:20 +00:00
Zhenwei Chen
6e73954181
[automerger skipped] Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358
am: 89ad53e3cb
-s ours
...
am skip reason: Merged-In I8f94f984dc1bf833653ae49557fdd02f736b365c with SHA-1 54615b3bec
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20638347
Change-Id: Ia90bd98be91c7471af6efee7a9d6d4f36de4e08d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 10:16:35 +00:00
Zoey Chen
45c646d6cb
Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24
am: 8b0070a509
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882
Change-Id: Iffed6efb8542259ae3f1ca22c198cc768a4ad126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 10:13:35 +00:00
TreeHugger Robot
8dd0992634
Merge "Add back resources exported for external usage 2"
2022-12-07 09:44:50 +00:00
Zoey Chen
8b0070a509
Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882
Change-Id: Ic4f9bb2f9fb07e9243dbb327f2ce0a41eeb9da0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 09:29:48 +00:00
Zhenwei Chen
89ad53e3cb
Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20638347
Change-Id: I8d1993dea1435d4f6679e682be99025a9a0daa30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 09:29:07 +00:00
Zaiyue Xue
76f19809c1
Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()
...
Bug: 261390301
Fix: 261390301
Test: manual
Change-Id: I23a2f0e73c5840b87577e734a4760423e0d62516
2022-12-07 17:09:05 +08:00
jasonwshsu
c68ea17971
[Audio routing] Add strings for audio routing page for Android U
...
Bug: 237625815
Test: build pass
Change-Id: I0dfbf2a727e34695f23c68a7887c8ce966cf6b38
2022-12-07 16:56:50 +08:00
Zoey Chen
eef6d0cb24
Merge "[Settings] Update the title if launch the fragment from search app"
2022-12-07 08:43:10 +00:00
Zhenwei Chen
47fa893358
Merge "Fix batteryInfo unit test" into tm-qpr-dev
2022-12-07 08:31:44 +00:00
Chaohui Wang
eece0f702f
Move config_isSafetyCenterLockScreenPendingIntentFixed
...
To res-export folder.
This resource is not used by Settings, but is exported for external
usage by other apps.
Put it into res-export folder to prevent from accidentally clean ups.
Bug: 234570979
Test: make Settings
Change-Id: Iff2a204a3dc4e97c19ef92997489760c3ed1505a
2022-12-07 15:37:53 +08:00
Zoey Chen
a3c97876bb
[Settings] Update the title if launch the fragment from search app
...
Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47
2022-12-07 07:18:42 +00:00
Bonian Chen
854eb4947a
[Settings] Code refactor for performance
...
Perform query in the background thread to reduce the time required for
rendering UI.
Bug: 260540995
Test: local
Change-Id: I4286553b44b51752ae64a9bb2ce5656fe7e9b4e8
2022-12-07 06:28:44 +00:00
Chaohui Wang
513827c5d5
Merge "Reduce flaky of whenCanDisplayLocalUi_displayed"
2022-12-07 06:14:48 +00:00
Chaohui Wang
4c11d02c10
Add back resources exported for external usage 2
...
These resources are not used by Settings, but is exported for external
usage by other apps.
Put them into res-export folder and add a README to prevent from
accidentally clean ups.
Bug: 234570979
Test: make Settings
Change-Id: Ia72cbde0b073ccb7624abeecb66e48d9c646f401
2022-12-07 14:09:57 +08:00
Zhenwei Chen
36c1e7dc20
Fix incorrect dock defender banner icon.
...
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png
Bug: 261156455
Test: Unit tests passed and manual test on the device
Merged-In: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
(cherry picked from commit 52323128dc
)
2022-12-07 05:46:57 +00:00
Chaohui Wang
b4a8e4b314
Reduce flaky of whenCanDisplayLocalUi_displayed
...
Bug: 246877208
Test: Unit test
Change-Id: I0b2554521b55fcfacc24e59a81ddc08b2eb9d70c
2022-12-07 12:03:47 +08:00
TreeHugger Robot
09d471132d
Merge "Use PRIVACY_CONTROLS enum in PrivacyControlsFragment"
2022-12-07 03:45:44 +00:00
TreeHugger Robot
8318b2b7b6
Merge "[MTE] add more search terms for user toggle"
2022-12-06 23:54:27 +00:00
Nate Myren
8e3bc8c3ce
Use PRIVACY_CONTROLS enum in PrivacyControlsFragment
...
Fixes: 260055305
Test: build
Change-Id: Ic7fe61d50416608496d1f0dfbc34735e61461a37
2022-12-06 14:25:29 -08:00
William Escande
4c47fe5a66
Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f
am: cf36286d05
am: 0adc966d8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877
Change-Id: I4a829cd044d5b8dd51ea119068b578f84309ed7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-06 20:26:53 +00:00
TreeHugger Robot
c2cf680c0e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1c6313d8c0
-s ours am: 2f55f40ff3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20631324
Change-Id: I4f2b77d300dd7eb5317a243494c579956a0130d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-06 19:45:11 +00:00
Bill Yi
62874aa4e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8433161d48
-s ours am: 73015c5fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20631324
Change-Id: I58a585c8becafd36130e912d7e0a4db181aab264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-06 19:44:50 +00:00
Florian Mayer
f593803c88
[MTE] add more search terms for user toggle
...
some advanced users might be familiar with the technical terms
Bug: 245624194
Change-Id: I6cab375e78d9e613b33b85858aee94ec82e9986c
2022-12-06 19:26:51 +00:00
Bonian Chen
0a3438c194
Merge "[Settings] Add BT and WiFi reset option"
2022-12-06 16:08:32 +00:00
Chaohui Wang
7786ca83ca
Merge "Add back resources exported for external usage"
2022-12-06 15:39:31 +00:00
Anna Bauza
ec91ab2bec
Merge "add settings log to user creation actions"
2022-12-06 15:25:51 +00:00
TreeHugger Robot
ccc77bf359
Merge "[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible."
2022-12-06 14:56:29 +00:00
Vania Januar
33419410ea
Merge "Toggle for disabling stylus buttons."
2022-12-06 14:24:06 +00:00
Santiago Seifert
e35774664f
Remove redundant method in LocalMediaManager
...
Test: atest LocalMediaManagerTest
Bug: 241888071
Bug: 235352899
Change-Id: I699572a97bbb92d52bc2948d955c4964883f2660
2022-12-06 13:38:39 +00:00
Bonian Chen
dc6877f2ef
[Settings] Add BT and WiFi reset option
...
Add an BT and WiFi reset option into factory reset menu.
Bug: 260034791
Test: local
Change-Id: I9031765cd5a012e3216971a3302176a96c2fbd23
2022-12-06 13:08:46 +00:00
Chaohui Wang
b62b890b71
Merge "Migrate AppPermissionSummaryTest to AndroidJUnit4"
2022-12-06 13:00:03 +00:00
Chaohui Wang
4c091fffcc
Add back resources exported for external usage
...
These resources are not used by Settings, but is exported for external
usage by other apps.
Put them into res-export folder and add a README to prevent from
accidentally clean ups.
Bug: 234570979
Test: make Settings
Change-Id: Ia46e94f4ece6a40edf95b47188f45659650d443c
2022-12-06 20:57:01 +08:00
Wesley Wang
dbd95eb47b
Merge "Fix incorrect dock defender banner icon."
2022-12-06 11:57:23 +00:00
William Escande
0adc966d8c
Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f
am: cf36286d05
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877
Change-Id: I48c191048a87cf6dd4e3433d412836c25aae5bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-06 09:51:34 +00:00
PETER LIANG
14f145181f
Merge "Fix the preview should keep the same layer after font or display size change."
2022-12-06 09:47:59 +00:00
Zhenwei Chen
52323128dc
Fix incorrect dock defender banner icon.
...
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png
Bug: 261156455
Test: Unit tests passed and manual test on the device
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
2022-12-06 09:40:50 +00:00
Zaiyue Xue
3d7b8b3bfe
[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible.
...
screen_record: https://drive.google.com/file/d/1Wdm8Wpn39k6E9Yo4bbTENf5VANP337QA/view?usp=share_link&resourcekey=0-1LNmaTaZI13DUmjNfkBehQ
Bug: 252407178
Fix: 252407178
Test: maunal
Change-Id: Ia08dea791bb72113719fd1316e8e9587a96eaef1
2022-12-06 17:36:55 +08:00