PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,208 Commits 1 Branch 0 Tags
ae26811b46170f7e9edac692d34bef30b77ce185
Commit Graph

123208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
ae26811b46 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 am: 3a164bc0db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I5865f54eda7456ee9a1630e3d1bec7a0f8470450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 13:34:01 +00:00
Chaohui Wang
1589d91e42 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 72f42fe9f2 am: d91ec4c6ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: Ie5cbd3133fb810621a7e1b8ebfde524edd4aa563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 13:25:48 +00:00
Chaohui Wang
3a164bc0db 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: I2d6c0af8414dc753ebba0d82ef188ea136558749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:51:21 +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
Vania Januar
2c77f5a3ed Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 am: a2f4601fa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: I1c9d10acc836e6a1cb6ddd34f987c2292f9880b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:10:18 +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
Vania Januar
75d8bf6b10 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 247fed89c4 am: aa438742ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: I043d7acab120d6d9fc3b1aed4833466b358b4542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 12:06:04 +00:00
Chaohui Wang
5b18837a49 Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev 2023-05-05 11:32:13 +00:00
Vania Januar
a2f4601fa8 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: I63c9b6e5bdd23a0f57cc7729bcbd6606cb89c4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 11:27:18 +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
Chaohui Wang
dbe6495c31 Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab am: 112e3233fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: I8c56224290c812975dcf93a1d6e266869537025b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 10:05:38 +00:00
Chaohui Wang
9c30db071c Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b am: 3d06aec9ab am: ee0a1b5224 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156

Change-Id: I6f19ceea151d73bb6a9f1c79ff723326260c26cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 10:00:49 +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
112e3233fd 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: I2626fc0a38e21f319a50f413203b0aae086f3ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 09:21:43 +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
7c042f374b Merge "FRP bypass defense in the Settings App for SPA" into udc-dev 2023-05-05 07:57:39 +00:00
Chaohui Wang
bdb1c526c4 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: 8b550ddb4c am: 2adf3aa527 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

Change-Id: I73331127fc3d89a3688db73a14caffc84e18fcfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 04:07:00 +00:00
Automerger Merge Worker
d933136371 Merge "Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: 5f12c8fcf8 am: daf2c793d1" into udc-qpr-dev-plus-aosp 2023-05-05 04:04:33 +00:00
Chaohui Wang
0dc4869b93 Merge "Log app special permission change for SPA" into udc-dev am: 804214c160 am: 8b550ddb4c am: f7e0171059 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990957

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

Change-Id: I0796b0de9f56332c6745a786796fb5d3ccdae6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 04:04:23 +00:00
Daniel Huang
72c357abc9 Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22 am: 5f12c8fcf8 am: 719d54a0ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936

Change-Id: If525f9127dab9fb661ee9970af420d360cd29c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 04:02:58 +00:00
Chaohui Wang
2adf3aa527 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: I84a2cf46197e91fc0e840f7916fa34434914b548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:35:22 +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
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
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
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
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
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