Han Xu
d2e6c2fe6d
Fix wifi QR layout to fix image stretching
...
Bug: 270063908
Test: manual
Change-Id: I86e7d54bb78306292fcb355c1a4879a43cc876f7
2023-05-08 15:58:04 +08:00
Angela Wang
1113d5e9b5
Merge "Hides Flash Notifications illustration on tablet" into udc-dev
2023-05-08 07:46:55 +00:00
Charles Chen
8ad361f548
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6
am: b67f9c939d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416
Change-Id: I9405881518e5b4afa21dc7d8e69afc95ce4b3877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 07:09:54 +00:00
Charles Chen
4a048e404a
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6
am: 492530af2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416
Change-Id: Idbe0fe4c1836bcf2d7760e92f8e5245112734c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 07:05:27 +00:00
Charles Chen
492530af2d
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416
Change-Id: I22e5078be5ab34e25be33a58939a1257c1bdcd4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 06:27:59 +00:00
Charles Chen
b67f9c939d
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416
Change-Id: I17b847e8ab3cc4911342b4db900d53640df007fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 06:23:42 +00:00
Sunny Shao
b723c4f96a
Fix the updateDialogForCdmaPhone test case failed
...
- This is a side effect of the CL(ag/16379105) which removed the getTextAsDigits API.
- Update the return value as empty string of the TelephonyManager.getImei().
Fixes: 215071948
Test: atest ImeiInfoDialogControllerTest
Change-Id: I790b5dc505ad1a91a951a4c46b241baddea392a1
2023-05-08 14:01:23 +08:00
Charles Chen
f22d51b5f6
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev
2023-05-08 05:39:07 +00:00
Guangjie (Jerry) Shi
a537078a3d
Merge "Use correct filter" into udc-dev am: cf440dcae5
am: 90869f6fab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001
Change-Id: I7f0add571feff5f301d38ee10b8f068322774105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 04:06:05 +00:00
Guangjie (Jerry) Shi
cdbf216781
Merge "Use correct filter" into udc-dev am: cf440dcae5
am: 860002b42c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001
Change-Id: I438c8153d07882280f6eef757fb11958bc0cc64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 04:01:25 +00:00
Guangjie (Jerry) Shi
860002b42c
Merge "Use correct filter" into udc-dev am: cf440dcae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001
Change-Id: I731560cdaae8973c95f87e1a3af108356b42505b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 03:24:29 +00:00
Guangjie (Jerry) Shi
90869f6fab
Merge "Use correct filter" into udc-dev am: cf440dcae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001
Change-Id: I1a2232ecab3a2cdb9c5af81b382a422284b0c323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 03:20:25 +00:00
Guangjie (Jerry) Shi
cf440dcae5
Merge "Use correct filter" into udc-dev
2023-05-06 02:38:26 +00:00
Jack He
61e20187bd
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
am: 518d08f978
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: I196b9081f1c6442834dc2884d2c96bdf6eaf2a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 02:01:21 +00:00
Patty Huang
06f934c87e
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8
am: 636eb36df0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938
Change-Id: I5e059589b04bc9ec3849b27c570e0a876fabfe55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 02:01:19 +00:00
Jack He
a38db8628e
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
am: 22e2bd2b85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: I72f712e1996efe37547b14ca2e0c5dd806a49180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:56:57 +00:00
Jack He
518d08f978
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: If404c06085d34c9f87b164c4b396da782e4e64fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:16:07 +00:00
Jack He
22e2bd2b85
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: I5ad786001f89627dbede25e1db8aae59da83af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:16:06 +00:00
Patty Huang
636eb36df0
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938
Change-Id: I5cfb6ea17ed21f359c07f67b299f6f57c6f6d63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:16:05 +00:00
Treehugger Robot
74375351cb
Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d
am: 0e8839d15c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998
Change-Id: I8c7fa00351d7e867e7830e3de70cf15d1b05a874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 00:54:58 +00:00
Treehugger Robot
14efad99d4
Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d
am: b492914807
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998
Change-Id: Ie1f2311d208380d807a52411fcd398d77b61aae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 00:52:36 +00:00
Jack He
2605ccbcfa
Merge changes from topic "LeAudioBeta" into udc-dev
...
* changes:
Hide the LE audio toggle by flag
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
2023-05-06 00:42:40 +00:00
Treehugger Robot
0e8839d15c
Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998
Change-Id: I4dd7fcb722810ecc8a844b5353f3b202b7e9f72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 00:12:51 +00:00
Treehugger Robot
b492914807
Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998
Change-Id: I45f5fbe9c81c81c111661a33f1c418a604de2977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 00:12:42 +00:00
Becca Hughes
d4c33e36cf
Fix settings live update am: 481be6dde4
am: f736380002
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769
Change-Id: I9699ca0f16a48a1069903b333150f95486962f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 00:01:09 +00:00
Becca Hughes
10c84dc4a0
Fix newly installed providers bug am: 17a0266b16
am: fc4a33b355
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: Ied88bf7e2c846c4b9d6d165da76c9797615b7151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 00:00:27 +00:00
Guangjie (Jerry) Shi
2bf52acd0c
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527
am: 6ee57bd7b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: I4e6d2fd92a359a81d9eb1e98defafca8571fb80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 23:58:58 +00:00
Chaohui Wang
c7ee31956d
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49
am: 7e441b2496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I3f6074a0be4c3c5bb7db43f11428fda8c2d4d9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 23:54:23 +00:00
Becca Hughes
ed295c248e
Use correct filter
...
Test: TH
Bug: 280908763
Change-Id: I8a80e8533578b5e0b7a9b516c488b3602d18feef
2023-05-05 23:42:29 +00:00
Treehugger Robot
1dc52d159d
Merge "Set primary services as enabled" into udc-dev
2023-05-05 23:40:43 +00:00
Becca Hughes
dd4b33d784
Fix settings live update am: 481be6dde4
am: eb5c65a43b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769
Change-Id: I43a4d9dd08534bafb9599ece6889629ac9a5b9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 23:28:14 +00:00
Vania Januar
8dfae8505d
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
am: 7f65b03c73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: I533af7ecfcf32a55abc6b8bab1094086cd0f2d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 23:17:23 +00:00
Chaohui Wang
d4a9230ffb
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
am: ab3c6d568c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: Ib20ebb523379be2585c6c03b4abfd6e181727e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 23:03:46 +00:00
Chaohui Wang
35245a74b4
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: fa48499eb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: Ic21eb2ff2aa786217d34edcce696f31ba3295749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:59:43 +00:00
Daniel Huang
18df86c7e6
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: ca5f384333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I42ab933fe1fab30caee8dad7e921ef495baa578b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:58:39 +00:00
Becca Hughes
f736380002
Fix settings live update am: 481be6dde4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769
Change-Id: I8c32d30c3460cdef22f2a8d34cd804b09a33eba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:53:53 +00:00
Becca Hughes
eb5c65a43b
Fix settings live update am: 481be6dde4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769
Change-Id: Ie3315c417c4829dd6eab07579cf1ce077bf591ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:52:40 +00:00
Bill Yi
7ed65dbcd6
[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f
-s ours am: eb890c8bf8
-s ours am: bdeb587767
-s ours am: bdba9f43ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: Icfd764a2df599035bfc7a08592539b192eb827a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:52:20 +00:00
Bill Yi
c654f7fe7b
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c
-s ours am: 3f186b6b1c
-s ours am: 649fb33ad4
-s ours am: 54f6fc6d11
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: If70f3624ac139e400eecec0650448f316d14a049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:52:06 +00:00
Becca Hughes
4fe1f506dd
Set primary services as enabled
...
Test: make
Bug: 281121157
Change-Id: Ide7902d0561fa6e513e90f8245da6a754c856ae7
2023-05-05 21:47:58 +00:00
Becca Hughes
b15ed12119
Fix newly installed providers bug am: 17a0266b16
am: fa5c54dcaf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: I4364111601f67e6661dd7b6f09ef7f36361769db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 21:39:26 +00:00
Alice Kuo
345889b5e2
Remove CSIP/VCP enable/disable from Setting
...
We moved this part to Bluetooth Framework, so remove these from Setting
Bug: 280626194
Test: NA
Change-Id: Ia84d0d68d8d77fde7479b6d4e49743dfeb821eae
2023-05-06 05:31:34 +08:00
Becca Hughes
fa5c54dcaf
Fix newly installed providers bug am: 17a0266b16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: I8060e38ff4ae2d05c0f63b0ac1ceac49379ac2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 21:01:01 +00:00
Becca Hughes
fc4a33b355
Fix newly installed providers bug am: 17a0266b16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200
Change-Id: Iddd9aacf9bcb06982a149dafc8ef634b3bf3f17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 20:57:16 +00:00
Becca Hughes
481be6dde4
Fix settings live update
...
We were using a setting observer to watch
for changes but it was being cleaned up
because we did not hold a reference to
it.
Test: make
Bug: 280905737
Change-Id: I154951f47af20998e25d62a82a8e79f9c00fa027
2023-05-05 20:32:44 +00:00
Becca Hughes
17a0266b16
Fix newly installed providers bug
...
Package monitor was not registered
properly.
Change-Id: Ifde2e6027b2aee2355114c8ff9b0d1f542fa2f8d
Test: treehugger
Bug: 280867431
2023-05-05 18:27:26 +00:00
Guangjie (Jerry) Shi
b9853fd9f4
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527
am: 5ea3d20578
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: Id318cb90a4fe3d364cb91c4a6b3228835860c6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:06:33 +00:00
Guangjie (Jerry) Shi
5ea3d20578
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: If4dc87d555834f8c89e2de23b09d2c0cad78ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 17:27:57 +00:00
Guangjie (Jerry) Shi
6ee57bd7b8
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: I910b9821216fa1a5285193ce59b78525eb91aef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 17:23:30 +00:00
Guangjie (Jerry) Shi
2898e3b527
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev
2023-05-05 16:45:37 +00:00