Commit Graph

124547 Commits

Author SHA1 Message Date
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
9768e06a1e 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: I555838c800e6d5c89d20601347decf58caa37993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:00:48 +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
Treehugger Robot
972423a2aa Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 9a9a6b13f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ie857ab16a7a38c6543698e04c0a456c1e8205bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:40:24 +00:00
Treehugger Robot
a5fff2a551 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: 0e8839d15c am: 74375351cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I6e06d53a8089dc2a9b0a09d76ad2fb37ecd4c019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:38:52 +00:00
Treehugger Robot
9b6a7daf95 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 14efad99d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Icb0f9c343ff90fc5d032da8276640a895407698f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:37:45 +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
9a9a6b13f5 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: I5ccdf60696b11fb4258055103381155c3f16a176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:54:36 +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
Becca Hughes
05757330df Fix settings live update am: 481be6dde4 am: f736380002 am: d4c33e36cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Iec15d7310b0fc249b8494cdade3f9341e07450bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:36:02 +00:00
Becca Hughes
e4bc3c1918 Fix newly installed providers bug am: 17a0266b16 am: fc4a33b355 am: 10c84dc4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I6e70f50ca955d2049525ac4616f1a0d595d88307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:35:04 +00:00
Guangjie (Jerry) Shi
706d298584 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 6ee57bd7b8 am: 2bf52acd0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I09d4cd580feb1382ce7f8ce3a8431ad0e9e3bccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:33:38 +00:00
Chaohui Wang
9ad628f4fc Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 7e441b2496 am: c7ee31956d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I64dea67242931420ce1379add027c1dbf1aea2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:23:08 +00:00
Becca Hughes
8641a39b80 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: a85c239613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Ia8d41eb7c84a38a57eb9ab2af632bdf68d44c172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:17:34 +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
Becca Hughes
5e9b4bf2e2 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: dd4b33d784
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I0f22afebc2b1930b3d18239cecec98882be22b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:41:36 +00:00
Treehugger Robot
1dc52d159d Merge "Set primary services as enabled" into udc-dev 2023-05-05 23:40:43 +00:00
Vania Januar
9a94ce4426 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 7f65b03c73 am: 8dfae8505d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: I7c5dea3e39367912df741f200d349abea04742f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:39:42 +00:00
Becca Hughes
a85c239613 Fix settings live update am: 481be6dde4 am: eb5c65a43b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I30931cb72a1906baeea0bccfca50deb192a00d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:34:01 +00:00
Chaohui Wang
782535b639 Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: ab3c6d568c am: d4a9230ffb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: Ic8caf46e961958af20d01ad861143f16b4732229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:32:52 +00:00
Chaohui Wang
3db97d8476 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: fa48499eb6 am: 35245a74b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: Iec8c27381069e10a0d7086df21ce2b62b911d6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:28:55 +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
Daniel Huang
a90864b7d9 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: ca5f384333 am: 18df86c7e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: If248e6e1317b1830f7f6531ab2fd853795de1820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:27:25 +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
Bill Yi
69ed533776 [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: 7ed65dbcd6 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: Ica01ae92654387b0ccab1acd4dd34ac81c5f7479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:15:34 +00:00
Bill Yi
ef9aa836f5 [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: c654f7fe7b -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828

Change-Id: I8a97e31c51716bcf24f28c5b7be100aa3c071f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:15:19 +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
016b0bee12 Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf am: e150bb8a57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: Icadb06b5a78962056e61754bdb8f9c240febb6f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:26:44 +00:00
Becca Hughes
97d865845c Fix newly installed providers bug am: 17a0266b16 am: fa5c54dcaf am: b15ed12119
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I93dab6fc16e7888bdef5886d857897cbafa93085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:21:18 +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
e150bb8a57 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: I51e4b23ea053e27c31586c1efe3fe7f3368b006a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 21:43:34 +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