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
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
Guangjie (Jerry) Shi
4489cf5c71
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578 am: 9c922641c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: I9e9ac2cdab52ffbd3c878bc972ca8a12ec99a995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:53:27 +00:00
Guangjie (Jerry) Shi
7096d488d4
Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 5ea3d20578 am: b9853fd9f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667
Change-Id: Ic6462c987370c9c3ba3731747328fcab2b5a31d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:51:02 +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
9c922641c1
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: Ida6d4cc55ec83fe30a75fb577170f47b60bd0eb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 18:08:37 +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
Max Spencer
bd861db36f
Fix title of no-screen-lock notification
...
Discrepancy was surfaced during localisation testing.
Fix: 281054224
Test: None
Change-Id: Ifabafbf5af0775e25b2c41670318a3aabc2cb7f2
2023-05-05 16:21:52 +00:00
Jerry Shi
8d167d55f3
Do null check to account for the case where provider is only autofill
...
provider.
Test: local build
Bug: 281047738
Change-Id: I9f3dca118a0d4182e2d727fa011dcb48db2a553f
2023-05-05 14:59:27 +00:00
Marcello Galhardo
bb8c04e072
Move Note Shortcut from Settings to SystemUI
...
* Removes all code related to Note Shortcut from Settings
Test: manual
Flag: not needed
Fixes: b/280431176
Change-Id: I6bb6cfbb98a57b6ad3cf261626b3d84d0be96e53
2023-05-05 14:54:27 +00:00
Chaohui Wang
ae26811b46
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 am: 3a164bc0db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I5865f54eda7456ee9a1630e3d1bec7a0f8470450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 13:34:01 +00:00
Chaohui Wang
1589d91e42
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 am: d91ec4c6ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: Ie5cbd3133fb810621a7e1b8ebfde524edd4aa563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 13:25:48 +00:00
Chaohui Wang
3a164bc0db
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I2d6c0af8414dc753ebba0d82ef188ea136558749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:51:21 +00:00
Chaohui Wang
d91ec4c6ce
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: Ia558ba2a9d668942483164792899339d355e9bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:47:14 +00:00
Vania Januar
2c77f5a3ed
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 am: a2f4601fa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: I1c9d10acc836e6a1cb6ddd34f987c2292f9880b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:10:18 +00:00
Chaohui Wang
72f42fe9f2
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I4c0efabd30e2e9cf0d46477672741474bb8203f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:09:38 +00:00