Becca Hughes
72ff60a0e4
Merge "Disable all providers if none selected" into udc-dev am: 762691c365 am: 9230389dcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870
Change-Id: I32c068036822267003322299e4ff7f22e32b4dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:14:44 +00:00
Austin Delgado
8c8cf133be
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 am: 083f9699c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I3eb79af0410b2ca6b7e41ff2dfccd403e64fcd0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:06:20 +00:00
Derek Jedral
a783d32ab1
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 898e1d95f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I2269002faf18bbd9932cc91908a74517c7f6b9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 22:23:49 +00:00
Becca Hughes
762691c365
Merge "Disable all providers if none selected" into udc-dev
2023-05-08 20:58:01 +00:00
Austin Delgado
2971c13923
Merge "Fix going back after biometric enrollment in SUW" into udc-dev
2023-05-08 19:39:41 +00:00
Derek Jedral
42deb763e0
Merge "Change preference title if Active Unlock enabled" into udc-dev
2023-05-08 17:56:32 +00:00
Austin Delgado
6e745242da
Fix going back after biometric enrollment in SUW
...
Bug: 280530120
Test: atest BiometricEnrollActivityTest
Test: tested manually by swiping back after enrollments
Change-Id: I305dd0904f86e2fc77f02047de8f3fc2c54621cb
2023-05-08 17:24:19 +00:00
Becca Hughes
5262570691
Disable all providers if none selected
...
Bug: 280905737
Test: manual
Change-Id: I53214c29cd7f03c8034284e5067f03305566397a
2023-05-08 17:19:52 +00:00
Angela Wang
3716e194b1
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ibbb77dba4c77c09f2f6deb2db4bafefa82ed151f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:11:21 +00:00
Angela Wang
1113d5e9b5
Merge "Hides Flash Notifications illustration on tablet" into udc-dev
2023-05-08 07:46:55 +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
f22d51b5f6
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev
2023-05-08 05:39:07 +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
cf440dcae5
Merge "Use correct filter" into udc-dev
2023-05-06 02:38:26 +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
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
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
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
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
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
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
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
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
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
08b2b68e22
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev
2023-05-05 02:33:13 +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
Becca Hughes
3096997718
Use isPrimary bit to determine top provider
...
If the cred man provider has the isPrimary
bit set then we should use it as top
provider.
Test: ondevice
Bug: 280454916
Change-Id: I8c5651909d3926f09549c64af68185f1ef633198
2023-05-04 21:19:54 +00:00
Guangjie (Jerry) Shi
38a3645ad1
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I3beee0f10d1f007b8df76f3871a01bae7121d013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:55:30 +00:00
Xiaozhen Lin
cf18fba86c
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I13fad162f2d5f1b92ee90a079dea99fc68114c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:52:46 +00:00
Guangjie (Jerry) Shi
817ee8489f
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev
2023-05-04 17:33:03 +00:00
Xiaozhen Lin
be911918d0
Merge "Password clearing in Settings App" into udc-dev
2023-05-04 17:09:34 +00:00
Lucas Silva
5cd017f470
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I067595333640ccba5b76f54a2b529049869192c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:06:07 +00:00
Jerry Shi
645ba04085
Modify the usage of setEnabledProvider to temporarily passed in empty
...
list.
Test: local test
Bug: 280492574
Change-Id: Id13aea203636527bcda745727aae417b2a8e289c
2023-05-04 08:57:43 -07:00
Lucas Silva
d66bde103a
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev
2023-05-04 15:37:25 +00:00
TreeHugger Robot
76edddc1c5
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I97766d9ecac3a7de66d7d1b66a95264c14049a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:23:05 +00:00