PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,934 Commits 1 Branch 0 Tags
97266f7ed49dbb2d18f984f64df2930e8575fe3f
Commit Graph

125934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
eb890c8bf8 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -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: I93c612069bd783894cfbc07e1f7e1028dd1a7780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:21:20 +00:00
Bill Yi
3f186b6b1c [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -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: I9fd542fb1505109f1e68ce2849d06061b7498093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:21:02 +00:00
Bill Yi
e48fa8c19f Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" 2023-05-04 22:39:57 +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
Guangjie (Jerry) Shi
5fb7bdb79b Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f am: f3e24a0595 am: 22776f3097 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498

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

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

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

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

Change-Id: Ifb3b9d5ab39f06d954163d46e3ff7c339b385e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 18:32:21 +00:00
Oli Thompson
69fcc2ba5c Merge "Change icon in settings work challenge" into udc-dev 2023-05-04 18:28:23 +00:00
Guangjie (Jerry) Shi
22776f3097 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: I8bbf72d419885144d48d52c2458bf3322a18619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 18:15:26 +00:00
Xiaozhen Lin
78c986c89e Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: b0df220382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

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

Change-Id: I8b81873853261b242fc02df9dc48c466b5401295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 18:14:25 +00:00
Xiaozhen Lin
f8770a9d56 Merge "Password clearing in Settings App" into udc-dev am: be911918d0 am: 6326345a03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954

Change-Id: Ib3d54d7075f217d01d407c20e0ba02c5dc4e627e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 18:14:14 +00:00
Guangjie (Jerry) Shi
b3b562cd34 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: I12b362c2275c81a8875700fb8fe62fb4ae345d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:55:37 +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
6326345a03 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: Icdfaa898af945ecd1592a44a86b4b8cafffe95da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:54:40 +00:00
Guangjie (Jerry) Shi
f3e24a0595 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: Ie4d4a6cdc9e94ce2143255e7f380ff7492abe825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:54:31 +00:00
Xiaozhen Lin
b0df220382 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: I6706bf4e642f5a7dbfdd6ec6f328382644407b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:54:02 +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
Lucas Silva
c30d294480 Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a am: 86231b9ec5 am: 100c550fda am: 90763da52b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: Ic9ba224ec8d8ed26ca169069de91b8e55c1a9f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:37:34 +00:00
TreeHugger Robot
15d09d4679 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5 am: 1765b7d866 am: 2d3c8e3c37 am: e907bf4a02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: Icb00aa8409f0c501f166f91bd974567eb2f4e251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 17:37:23 +00:00