Weng Su
3f1fb952f2
Merge "Fix NullPointerException in WifiConfigController" into main
2023-10-12 07:42:41 +00:00
Weng Su
de77e7bf92
Fix NullPointerException in WifiConfigController
...
- Add null checking for spinners to avoid NullPointerException in Monkey tests.
Fix: 302628103
Test: unit test
atest -c WifiConfigControllerTest
Change-Id: I301163b85b0b87edba9eee2c1b34d5a6104eaaea
2023-10-12 14:45:20 +08:00
Chaohui Wang
d18baed65f
Remove wifi_settings
...
Bug: 285231003
Test: m Settings
Change-Id: Ic3410e8449f97e0da049db053977a66f6e60b9b3
2023-10-12 14:35:57 +08:00
Angela Wang
6b95155040
Merge "Fix pair other ear button not hidden correctly for dual device" into main
2023-10-12 05:45:27 +00:00
Chaohui Wang
e16afdb73a
Merge "Optimize DataUsagePreferenceController" into main
2023-10-12 02:58:54 +00:00
Treehugger Robot
6402b83e0e
[automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
am: b06310a63f
am: 409a6b2492
am: 23c571ff2b
-s ours am: 8f4a7e7505
-s ours
...
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 15e17e0119
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829
Change-Id: Icef92513bd3ece34c10c4a7fb860f2c245d8759d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 02:48:21 +00:00
Treehugger Robot
8f4a7e7505
[automerger skipped] Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
am: b06310a63f
am: 409a6b2492
am: 23c571ff2b
-s ours
...
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 15e17e0119
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829
Change-Id: Ibf9478072143dfbe6af85271c9c4e5aa5c49626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 02:16:33 +00:00
Treehugger Robot
23c571ff2b
Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
am: b06310a63f
am: 409a6b2492
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829
Change-Id: I8873863c35e54bc92f5aae982fe159a5e5e46438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 01:43:51 +00:00
Treehugger Robot
409a6b2492
Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
am: b06310a63f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829
Change-Id: Id95f85e07c45a722a5229507be58cb582ca3587e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 01:11:05 +00:00
Treehugger Robot
b06310a63f
Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829
Change-Id: Id02586892e1b22d8450098323183c1ad33ca8574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 00:38:18 +00:00
Treehugger Robot
4b0bf8f98d
Merge "Clean up obsolete aliases for Truth." into main
2023-10-11 23:59:17 +00:00
Becca Hughes
4951641ddb
Merge "Fix icon UX bug" into main
2023-10-11 23:50:29 +00:00
Krzysztof Kosiński
665b151f87
Clean up obsolete aliases for Truth.
...
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 23:10:01 +00:00
Krzysztof Kosiński
6199490cd3
[automerger skipped] Clean up obsolete aliases for Truth. am: 15e17e0119
-s ours
...
am skip reason: Merged-In I8aab463c74d5e869d949a2b712886a9cc4d15709 with SHA-1 c81fbcef2e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25010716
Change-Id: I827777c46799016062f942c4ebb25702dddda5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 22:47:04 +00:00
Rex Hoffman
54ef7c6be8
Get basic tests working with ActivityScenario and manifest
...
Test: atest MemtagPreferenceControllerTest
Bug: 302146641
Change-Id: I06d94ae151cadd8498b009886ba7d4bd888911cc
2023-10-11 20:59:41 +00:00
Treehugger Robot
acd95546b2
Merge "Clean up obsolete aliases for Truth." into main
2023-10-11 20:40:29 +00:00
Becca Hughes
fa040ab39d
Add support for settingsActivity in settings
...
Adds support for apps to define settingsActivity
in their manifest which will be launched on tap
in CredMan settings.
Test: ondevice manual test
Bug: 300014059
Change-Id: I3c8879fc86cd9b90bed2a301afaa7d5b75e87e3d
2023-10-11 13:40:09 -07:00
Krzysztof Kosiński
15e17e0119
Clean up obsolete aliases for Truth.
...
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 19:41:36 +00:00
Krzysztof Kosiński
c81fbcef2e
Clean up obsolete aliases for Truth.
...
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 19:39:33 +00:00
Joshua Mccloskey
c320afa70d
Merge "Added UI tests for FingerprintEnrollIntro" into main
2023-10-11 18:53:38 +00:00
Saumya Pathak
2770170e0d
Merge "Show a separate tab for the Private Space" into main
2023-10-11 16:58:41 +00:00
Allen Su
00c40d85cd
Implement B&R for locale notification
...
Bug: 275306477
Test: by manual
Change-Id: I11471227a1c9263846f9451002d1ef149b460f7d
2023-10-11 16:28:27 +00:00
YK Hung
589c129f43
Merge "Fix the issue that system component items are missing in main branch." into main
2023-10-11 16:20:15 +00:00
Felix Oghina
800db77e62
[speech] fix settings robo tests
...
Bug: 300161951
Test: atest SettingsRoboTests:com.android.settings.tts
Change-Id: I31a97eb9dae4fb65c52af3075ad4aa82a7165d49
2023-10-11 15:43:20 +00:00
Angela Wang
79c7623f1b
Fix pair other ear button not hidden correctly for dual device
...
If the device is a dual device which supports both ASHA + LE Audio, it'll pair the other ear with CSIP and group it as a member device. If LE Audio is not enabled, the current logic will fail to recognize the other ear is already paired. Update the logic to well handling this situation.
Bug: 296646732
Test: atest BluetoothDetailsPairOtherControllerTest
Change-Id: Iba9655488203a242ad0e87764d6bf4df595e977d
2023-10-11 15:36:17 +00:00
YK Hung
f0f49746e0
Merge "Fix battery usage database is not clear when time is changed" into main
2023-10-11 15:05:46 +00:00
Chaohui Wang
8603782bc5
Optimize DataUsagePreferenceController
...
Bug: 295260929
Test: manual - on mobile settings
Change-Id: I89a36981771ef21f3c8213ad2039c3577196b493
2023-10-11 20:48:18 +08:00
Iavor-Valentin Iftime
54bec848cc
Merge "Settings for Polite Notifications" into main
2023-10-11 12:04:37 +00:00
Manish Singh
6efc455f2c
Show a separate tab for the Private Space
...
This covers all the known Settings pages using the tabbed view model.
https://docs.google.com/document/d/1CdjUjAE84-5ZEPRIfw5KYFjLVHtEZxc_sF0w95su8DA/edit?resourcekey=0-dAACT9HRexY1IyoxMmkVlw#heading=h.58jd58rmznte
Screenshots:
all apps
https://screenshot.googleplex.com/3E5Jm7Pi2JfN64r
with work tab:
https://screenshot.googleplex.com/8egk4yHK5jSENjR
PS Apps Special media management apps
https://screenshot.googleplex.com/BHHafqW7bgUwSGg
with work tab:
https://screenshot.googleplex.com/3cocdhruEmCCh5k
PS Location Services tab view
https://screenshot.googleplex.com/3DqJcT2BFTEpvYT
with work tab:
https://screenshot.googleplex.com/6Avpx6hxSrdGJw5
PS on screen keyboard tab view
https://screenshot.googleplex.com/4FzVNnBWwbUeJNw
with work tab:
https://screenshot.googleplex.com/8E8UhpWq8PL5nxU
PS password account tab view
https://screenshot.googleplex.com/6bDR4AKtth2S3EW
with work tab:
https://screenshot.googleplex.com/9msXV2TdHdJapch
PS storage tab view
https://screenshot.googleplex.com/5Nk2FTxwdmpEv3B
with work tab:
https://screenshot.googleplex.com/79tw2EaWZKfMsnC
PS appl_languages_work
https://screenshot.googleplex.com/3qrREeg3RQdHhhH
Bug: 302278487
Test: manual
Change-Id: I8cd39170827fbe251bc4075ef306206020b3a022
2023-10-11 12:32:17 +01:00
Zaiyue Xue
011725f89e
Fix battery usage database is not clear when time is changed
...
[Root Cause]: Intent.ACTION_TIME_CHANGED is listened in the java code, but it is not registered in the AndroidManifest.xml.
Bug: 304700667
Bug: 303352170
Fix: 304700667
Fix: 303352170
Test: manual
Change-Id: I326c525c4a370493e8caa70258580b6bd9dfe357
2023-10-11 17:40:14 +08:00
Zaiyue Xue
97fab476b4
Fix the issue that system component items are missing in main branch.
...
Please see the root cause in the bug description.
Bug: 304694899
Fix: 304694899
Test: manual
Change-Id: I89a146e979ed9eeca60cb03b464517359e6a3475
2023-10-11 16:51:30 +08:00
Wu Ahan
2ffe187d1b
Implement sfps enroll improvement feature with feature provider
...
Bug: 288155127
Test: Manually
Test: atest FingerprintEnrollEnrollingTest.java
Change-Id: Idb6e5afab4b9cbf8f2ed26819a55dcb34acb1ab9
2023-10-11 08:37:44 +00:00
Charlotte Lu
6a9297df54
Add updateApnType.
...
Fix: 304457374
Test: Visual Test
Change-Id: I29e1feb6d213a8629e670a4d8f8286f9a8b6082f
2023-10-11 14:13:12 +08:00
Charlotte Lu
7be5d1cc43
Add updateApnDataToDatabase.
...
Fix: 304672976
Test: Visual Test
Change-Id: If0ed6b8090a37c5a98ab2eeb29fba61c1173c0a7
2023-10-11 13:38:54 +08:00
Charlotte Lu
5b2de59480
Add validateAndSaveApnData.
...
Fix: 304649927
Test: Visual Test
Change-Id: I900a096a6e27f1db66af204201d4ca2523537c0d
2023-10-11 11:22:39 +08:00
YK Hung
74927c7e11
Merge "Fix NullPointerException when full charge unplug a device with work profile" into main
2023-10-11 01:58:24 +00:00
Zaiyue Xue
7385665d8c
Merge "Use empty BatteryDiffData instead of null to avoid NullPointerException" into main
2023-10-11 01:54:39 +00:00
Eric Biggers
03aa2e444e
[automerger skipped] Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
am: c44a165ec7
am: 15c5cd2478
-s ours am: e249035b89
-s ours
...
am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 938902d2df
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: Ic3b58db092ca05b3a0bf27d5e5ea9901b1b16215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 01:42:34 +00:00
Eric Biggers
54df046ca2
[automerger skipped] ShadowLockPatternUtils: remove patternEverChosen methods am: 938902d2df
-s ours
...
am skip reason: Merged-In If196bbef4755c644b3188043ed47e99817bf1856 with SHA-1 795a02c92a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25001398
Change-Id: I989b4b3ff97c74354caa472a7e6d437f44153dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-11 01:19:12 +00:00
Automerger Merge Worker
df06711096
Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp am: 97246649e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Iad0abf615b6d67107abd2317bf4a1e7d09989720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:42:43 +00:00
Bill Yi
1da00881c9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours am: eaeb26adb0
-s ours am: ea17648df4
-s ours am: 1c503fed67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Ib2f82bc298c89edda06a60d029fe7fbe19d7a6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:42:30 +00:00
Automerger Merge Worker
b882be16f1
Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into udc-qpr-dev-plus-aosp am: 656d481e18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I6c78e22e43a461a1ab214b4b826114b4422ef0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:35:25 +00:00
Bill Yi
c73e320e2b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours am: 1e702e6f83
-s ours am: f7b330feac
-s ours am: f5617ef79d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I6f73fc207580ea66e15175601a7a8efddca577ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:35:04 +00:00
Bill Yi
f02cb60c7e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours am: 1e702e6f83
-s ours am: 292fb5da73
-s ours am: 83ca01c4cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I22ca4aa665b0286cb1dc0e7c015703000b0ac770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:20:20 +00:00
Bill Yi
d59bdd43a0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f
-s ours am: eb51dfd4e9
-s ours am: fa9aef9061
-s ours am: e60a24fbb3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I97e7a2dd5046a87eba5040a33af9a780d2b3d433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:20:07 +00:00
Bill Yi
ad26ff8788
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6
-s ours am: 84ed68cd4d
-s ours am: c01f48c623
-s ours am: ee91548952
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: I2132936767ad7272ef3e285a97b4d6619a9ed79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:19:48 +00:00
Automerger Merge Worker
f690b0b38a
Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp am: 5fbadb8fbb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: If87411b29242223c00f8c37b3538a50f4a245404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:17:08 +00:00
Bill Yi
fbae942a27
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325
-s ours am: 9a58b15803
-s ours am: 1f9a5c2e17
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: Iba44592bbb7a5b3fe38d246cbf2721bd1093ddae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:16:45 +00:00
Bill Yi
6b607ea637
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fea268d325
-s ours am: 651aaef998
-s ours am: 68dcc0800a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: I7962136888bcc04deee81ba100e0d373a7798f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:09:00 +00:00
Bill Yi
8a084a6bed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248
-s ours am: 84970745cc
-s ours am: affc6a9688
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: I28df9d34840168b51b8132c48ea15548a59de28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 23:08:48 +00:00