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
daf2c793d1
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: I206f901fc41f60a6a825b107dfa1cfeb94e5c608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 03:15:39 +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
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
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
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
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
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
Mattias Nilsson
03a0bdd030
Set default value of battery percent preference
...
Read config_defaultBatteryPercentageSetting to set default
preference value for battery percentage in SystemUI.
Bug: 189235242
Test: Set resource and check device at boot
Change-Id: I6427a3b76f5641b387dc19f45e17b30820911e3a
2023-05-04 23:23:48 +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
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
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
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
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
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
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
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
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
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
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