Commit Graph

125745 Commits

Author SHA1 Message Date
Chaohui Wang
e790765a05 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: 534f046035
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: Ic93c794cabf05b997b980fc00111d67ac2f035cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 04:19:30 +00:00
Daniel Huang
07a0572fa9 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: 319351aaf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: I2e821256729615e2bbe68faa1ec2cd2bda0a8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 04:14:38 +00:00
Chaohui Wang
534f046035 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: I7ee9048d652ffd68da7b9dc7d713e8451603fd3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 03:18:05 +00:00
Becca Hughes
9b36bd4ed3 Use isPrimary bit to determine top provider am: 3096997718 am: 1955e67933 am: b1e0308d8f am: b16290301e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Ibfcfa06e5aee49113bc1ce1e86db8885e551a5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 03:05:43 +00:00
Chaohui Wang
804214c160 Merge "Log app special permission change for SPA" into udc-dev 2023-05-05 03:03:52 +00:00
Becca Hughes
7cc601625c Use isPrimary bit to determine top provider am: 3096997718 am: 4c657e3635 am: c54ac1369e am: e94f177748
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: I5d5c21fd8b36c824045952e4905eee0c4fc7d6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 02:56:06 +00:00
Becca Hughes
e346126f17 Use isPrimary bit to determine top provider am: 3096997718 am: 1955e67933 am: 28e5ef06b4 am: e69657227a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: If318ecf53d9c7b3406127a43d3e79970754b2a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 02:39:56 +00:00
Daniel Huang
319351aaf4 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: Icb0a6739f47101b83e9d6d634b22c084b039b515
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
Becca Hughes
b16290301e Use isPrimary bit to determine top provider am: 3096997718 am: 1955e67933 am: b1e0308d8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Ie12b30c8f334458d98bfb382de779f90b2388943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 01:40:26 +00:00
Becca Hughes
e94f177748 Use isPrimary bit to determine top provider am: 3096997718 am: 4c657e3635 am: c54ac1369e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: I6dd68d0ef31e3aa2a59ff0c8743c01305a932683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 01:29:23 +00:00
Becca Hughes
e69657227a Use isPrimary bit to determine top provider am: 3096997718 am: 1955e67933 am: 28e5ef06b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Ic885a62a7273e27b26235bd5a05f2ca5f2dfbce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 01:27:56 +00:00
Becca Hughes
b1e0308d8f 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: I00fc7b3c48ff0e921a07e9bebd8baccbb3211b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:26:23 +00:00
Treehugger Robot
b57cfb62a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: e1e392ba22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19350eb0722050b10de4c0f85f63ecdb1e061530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:22:02 +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
34e0a12753 Use isPrimary bit to determine top provider am: 3096997718 am: 6464b82525
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997343

Change-Id: Ib2ca71277a44069e1b0f91ac704374e3056d72de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:20:25 +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
Treehugger Robot
e1e392ba22 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-05 00:04:14 +00:00
Treehugger Robot
8f24e139c2 Merge changes from topic "tc_change_23050307_132"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5e4956845b
  Import translations. DO NOT MERGE ANYWHERE
2023-05-05 00:04:14 +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
Becca Hughes
6464b82525 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: I496a9ca5f2712cb3017502d8c99acea125aeff84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:46:40 +00:00
Becca Hughes
4c657e3635 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: I8e6537d62ca6802adbdfadf9535cc4395dd6154c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:39:14 +00:00
Bill Yi
8b5a74268d Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-04 22:28:31 +00:00
Bill Yi
077c0002e1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-04 22:28:31 +00:00
Bill Yi
6819d0b2ea Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-04 22:28:31 +00:00
Oli Thompson
aaa90f1325 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8 am: 2330c13289 am: 959976f5df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I36b0f2fb9cca390da08f47142bc1d42011b28578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:36:26 +00:00
Oli Thompson
e0eafd45de Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: 983c8081db am: 465ff4f2d2 am: be868c98fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: Ica75fec2baeb534914185ea19a4b1e2bf6894dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:28:41 +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
Oli Thompson
dd2f7964be Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8 am: 3c003a0300 am: ccb3614559
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: If56ee1bda5e1cf7e15d2194f8c3aba7270c41e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:58:34 +00:00
Oli Thompson
959976f5df Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8 am: 2330c13289
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I4b504a4d3f788136a6d7a3db54b439eb46db395b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:51:59 +00:00
Oli Thompson
be868c98fe Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: 983c8081db am: 465ff4f2d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I0325bc76920b50bca77085fa7db07d999d581c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:43:52 +00:00
Guangjie (Jerry) Shi
8859ad2649 Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: f3e24a0595 am: 6e2724c62d am: 09aa395cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: I0f96ba85dcf20d9c1ae8071fa246f79c07171dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:24:37 +00:00
Guangjie (Jerry) Shi
3b60e21e6b Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: 38a3645ad1 am: 01e1a4c0fd am: f35c0a1254
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: I2523f52110d178349148d83323c8315fbfb426b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:22:28 +00:00
Xiaozhen Lin
9baf9248e4 Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: cf18fba86c am: 1e3a085121 am: 7140c2bcb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: I216d1c8957e7bdcdb996611257b5a667e2ae8522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:22:16 +00:00
Xiaozhen Lin
2497deee03 Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: b0df220382 am: 8a16522a44 am: 2a8345d82a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: I3c99f7e917c48ec3edd7dc84a5ce623611af0be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:14:14 +00:00
Guangjie (Jerry) Shi
d5b33fd85f Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: f3e24a0595 am: 22776f3097 am: 5fb7bdb79b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: Ica27f1a2280222a594ae825a11c2542fac53ada9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:10:32 +00:00
Oli Thompson
465ff4f2d2 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: 983c8081db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I051363cf71979cd50d1b3f22032aecdcbd99c72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:05:41 +00:00
Oli Thompson
2330c13289 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I383dd7bb3c33516ffe70f404ff553289690016fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:03:11 +00:00
Oli Thompson
98cfe37cbf Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: 40c016b0d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I9984d7becf8c5070d985e5a1465b170aae439112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:02:07 +00:00
Xiaozhen Lin
183f7632fa Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: b0df220382 am: 78c986c89e am: 4a7a20e3e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: Ibcad59ee817630ee26c27c0a97bac0377c6b246d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 20:01:44 +00:00
Oli Thompson
ccb3614559 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8 am: 3c003a0300
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I2a28c3dd6fefc393201734364361b3b21db3bd96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 19:20:51 +00:00
Guangjie (Jerry) Shi
09aa395cd3 Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: f3e24a0595 am: 6e2724c62d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: I9d38cf6628d9f2f9868de5cfa11183cd4ef6c128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 19:20:18 +00:00
Guangjie (Jerry) Shi
f35c0a1254 Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: 38a3645ad1 am: 01e1a4c0fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: Ie09f47ba70f8dbeb99387c3acd57a60596314d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 19:17:17 +00:00
Xiaozhen Lin
7140c2bcb0 Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: cf18fba86c am: 1e3a085121
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: Ib95d046a197932718e3ea14bfc89e9c09e77357a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 19:15:58 +00:00
Xiaozhen Lin
2a8345d82a Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: b0df220382 am: 8a16522a44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: I7cadb738e7930639909c15208fc6b90581be531d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 19:14:46 +00:00
Oli Thompson
3c003a0300 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c am: a99e532ce8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: If9125a6c97bfb3520e2ee31f68e178c604f29f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 19:14:11 +00:00
Oli Thompson
40c016b0d1 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: Ibf70e18ac501c15790ff111154a824ae432b1af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:59:00 +00:00
Oli Thompson
a99e532ce8 Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I7af3a61b06c9922be100dbba9a2bd0b58ba784d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:57:31 +00:00
Guangjie (Jerry) Shi
6e2724c62d Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: f3e24a0595
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

Change-Id: Iad77b961d8b9352e14732a9bfb0311e23dac7348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:54:02 +00:00
Oli Thompson
983c8081db Merge "Change icon in settings work challenge" into udc-dev am: 69fcc2ba5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22965558

Change-Id: I75481f3d79891dba6f6fd5b1355433e288dac3a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:53:30 +00:00