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
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
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
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
Chaohui Wang
7e441b2496
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: Ia1b143ca50843e865dd899cd1e1e7e1832027e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:05:25 +00:00
Chaohui Wang
5b18837a49
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev
2023-05-05 11:32:13 +00:00
Vania Januar
aa438742ed
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
am: 247fed89c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Ie8ee82c7ec38135b7f8bba33e171aece1bf337a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 11:23:05 +00:00
Vania Januar
247fed89c4
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Icc6d64627bba5370c4d68a0456c0d2641540cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:45:36 +00:00
Vania Januar
7f65b03c73
Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585
Change-Id: Ifba006b60361a77faea3e25e4cfa73e3aa53fa44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 10:41:27 +00:00
Angela Wang
360cb671f2
Hides Flash Notifications illustration on tablet
...
Since tablet illustrations are not yet finalized, we'll hide the Flash
Notifications illustration on tablet for now.
Bug: 280748155
Test: checks the UI on phone and tablet manually
Change-Id: I5a309dec3291f3585cc1d9769e2465c94250fa7f
2023-05-05 09:54:04 +00:00
Vania Januar
072d8b90d0
Merge "Replace placeholder icons with stylus icons" into udc-dev
2023-05-05 09:50:11 +00:00
Chaohui Wang
39bf7dd530
Fix dialog leak in RequestPermissionActivity
...
Dialog still show when activity destroyed will cause leak.
Dismiss dialog when activity onDestroy to fix this issue.
Fix: 279522922
Test: Manually with "Don't keep activities"
Test: Robolectric Test
Change-Id: I445f4b160020823a6f6e2883055218c1224e2c48
2023-05-05 17:30:02 +08:00
Chaohui Wang
ee0a1b5224
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
am: 3d06aec9ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: Ie1b0bc84ff0a286544815d1b8e860b403ef157cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 09:22:02 +00:00
Chaohui Wang
3d06aec9ab
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: Id277b59be091126b986475450cc36c89bf24f52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 08:19:39 +00:00
Chaohui Wang
ab3c6d568c
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: If7fe17060ef6fd3b0f554ee8480105373d27f3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 08:17:00 +00:00
Chaohui Wang
7c042f374b
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev
2023-05-05 07:57:39 +00:00
Charles Chen
9dc35d21b4
Revert^2 Disable Settings large-screen optimization
...
Disable the optimization that is automatically enabled when
including Window Extensions through Activity Embedding.
The optimization causes to launch an additional trampoline
activity for deep links, even when the screen size is smaller
than required by Activity Embedding rules.
Bug: 267725145
Bug: 279461170
fixes: 280606740
Test: Build, perf metrics
Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests
Test: atest SettingsMultiPaneDeepLinkTest.java
Test: run v2/aep-ironwood/suite/test-mapping-ironwood-p0-cujs via ABTD
on cheetah/oriole/panther/raven in udc-dev/master branch
Change-Id: I74c9608fce92fc77c0f1ef2d61aba3af85afba02
2023-05-05 07:46:06 +00:00
Chaohui Wang
f7e0171059
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
am: 8b550ddb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: Ia903e4ca45754258386e9142007d5c9af03b7b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:33:35 +00:00
Chaohui Wang
fa48499eb6
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: Id17ea588b11e85f971d66c5df1fc60ea09aed1e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:21:36 +00:00
Chaohui Wang
8b550ddb4c
Merge "Log app special permission change for SPA" into udc-dev am: 804214c160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957
Change-Id: I64197b730225942a2cab8cf154b1ad6f4b438e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:19:04 +00:00
Daniel Huang
719d54a0ed
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 5f12c8fcf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: Id9d40a85143dc91f7831af69c9fa0b28825a3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:15:25 +00:00
Chaohui Wang
804214c160
Merge "Log app special permission change for SPA" into udc-dev
2023-05-05 03:03:52 +00:00
Daniel Huang
ca5f384333
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: Ia96ff86deff46dcd51a1502058535ae5271aa5cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 02:35:06 +00:00
Daniel Huang
5f12c8fcf8
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I6d1705a4e749d9d46d1c52433e6d7b3a3766f713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 02:34:58 +00:00
Daniel Huang
08b2b68e22
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev
2023-05-05 02:33:13 +00:00
Bill Yi
bdba9f43ad
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I103a5c2037a652321ed436047be159e845879b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:43:56 +00:00
Bill Yi
54f6fc6d11
[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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I5a2219a23ac792a1d8583b6345e8c46005f8e1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:43:35 +00:00
Becca Hughes
c54ac1369e
Use isPrimary bit to determine top provider am: 3096997718
am: 4c657e3635
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Icd1551c9a1bd5867480201659ee96cb76ab9f613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:21:57 +00:00
Becca Hughes
28e5ef06b4
Use isPrimary bit to determine top provider am: 3096997718
am: 1955e67933
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: Ibdba4a4a9d9e581ab2ab4b365a124dc3fb6ed5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:19:06 +00:00
Bill Yi
bdeb587767
[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f
-s ours am: eb890c8bf8
-s ours
...
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: I1912e8a1b21aae82c5ebd9c3f7daa14235d66978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:01:08 +00:00
Bill Yi
649fb33ad4
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c
-s ours am: 3f186b6b1c
-s ours
...
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2576828
Change-Id: Ib13a4b9830161df33f6d36827fbdb6e584d9e54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 00:00:53 +00:00
Becca Hughes
1955e67933
Use isPrimary bit to determine top provider am: 3096997718
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343
Change-Id: I9f410931f805bbf05bf3a7956a48483ed4388bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 23:49:42 +00:00