Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,426 Commits 3 Branches 0 Tags
f64e108968cdcdcfc112e7834981d2135e8d2522
Commit Graph

651426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
f64e108968 Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 am: e4cf95d54e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: Id429244dc874fcd31bb0741daf01c35a753b31d5
 2021-06-17 02:05:25 +00:00
Yunfan Chen
5cc5855633 Merge "Layout status/nav bar and decor window as normal window" into sc-v2-dev am: 56aad85b0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14732017

Change-Id: Idb326a2a0063e01aa72e862c89b2f0ff4adc2fc4
 2021-06-17 02:04:54 +00:00
Kevin Chyn
e4cf95d54e Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: I8108f8e41d50480cd3f9aced676ba13da0a37a34
 2021-06-17 02:01:23 +00:00
Yunfan Chen
56aad85b0d Merge "Layout status/nav bar and decor window as normal window" into sc-v2-dev 2021-06-17 01:46:00 +00:00
Kevin Chyn
c3e64b14c5 Merge "Add BiometricActionDisabledByAdminController" into sc-dev 2021-06-17 01:27:03 +00:00
Automerger Merge Worker
f306ed32f4 Merge "Merge "Drop prebuilt files to android source tree." into sc-dev am: 3989c51011 am: 1eb67865f7" into sc-v2-dev-plus-aosp 2021-06-17 00:42:50 +00:00
Nikita Ioffe
cc5220f295 Merge "Drop prebuilt files to android source tree." into sc-dev am: 3989c51011 am: a0b223a612 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002093

Change-Id: Iefeb0e8fa2fbd8543774364330b897b1192ef815
 2021-06-17 00:40:48 +00:00
Nikita Ioffe
d31cc8dfdf Merge "Drop prebuilt files to android source tree." into sc-dev am: 3989c51011 am: 1eb67865f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002093

Change-Id: I8d5914742a6e5fd424e8f3b11349b94f257f8946
 2021-06-17 00:40:45 +00:00
Felipe Leme
3891a887fb Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev am: 60ec24eb1e am: 4a412662ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948897

Change-Id: I2d1f0bf04701a1f81052e69da80aa466d125d9a6
 2021-06-17 00:40:31 +00:00
Automerger Merge Worker
070a30844a Merge "Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev am: 60ec24eb1e am: b368761e09" into sc-v2-dev-plus-aosp 2021-06-17 00:40:07 +00:00
Felipe Leme
45e5b21d51 Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev am: 60ec24eb1e am: b368761e09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948897

Change-Id: I4d0bed763dff558158364388e0c63cac06585084
 2021-06-17 00:40:03 +00:00
Bill Lin
2aa36fbbb3 Merge "Allow one-handed mode shortcut expand notification" into sc-dev am: 789f014c04 am: d3b7eb8dd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957128

Change-Id: Ib77976a9b61d0cc4e94a84363422dfad34a98569
 2021-06-17 00:39:36 +00:00
Bill Lin
55d3e45c4a Merge "Allow one-handed mode shortcut expand notification" into sc-dev am: 789f014c04 am: 2214897235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957128

Change-Id: Ic9c8b87988f723cb3ce14aa686fad17e4426e474
 2021-06-17 00:39:18 +00:00
Nikita Ioffe
a0b223a612 Merge "Drop prebuilt files to android source tree." into sc-dev am: 3989c51011 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002093

Change-Id: Ib73734f7cd265cfc5a29cdd729736bb9047385f0
 2021-06-17 00:34:46 +00:00
Nikita Ioffe
1eb67865f7 Merge "Drop prebuilt files to android source tree." into sc-dev am: 3989c51011 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002093

Change-Id: I8a3d5e21d299779d6606133665e5da9bb7ab896f
 2021-06-17 00:34:26 +00:00
Nikita Ioffe
3989c51011 Merge "Drop prebuilt files to android source tree." into sc-dev 2021-06-17 00:32:26 +00:00
Felipe Leme
4a412662ff Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev am: 60ec24eb1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948897

Change-Id: I8481a2aff98667c0af9cfbf8325a19c15b72d9f7
 2021-06-17 00:31:33 +00:00
Bill Lin
d3b7eb8dd1 Merge "Allow one-handed mode shortcut expand notification" into sc-dev am: 789f014c04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957128

Change-Id: I24b1fb1055403dd684bc0b1f96739fcdd8d6e809
 2021-06-17 00:30:48 +00:00
Felipe Leme
b368761e09 Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev am: 60ec24eb1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948897

Change-Id: Ia28e5a549a58c1c44bcab2b966839f128d1feb54
 2021-06-17 00:26:25 +00:00
Bill Lin
2214897235 Merge "Allow one-handed mode shortcut expand notification" into sc-dev am: 789f014c04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957128

Change-Id: Ic889ca6d24deb1e4a721f87837c3d813dbb1b0b2
 2021-06-17 00:25:38 +00:00
TreeHugger Robot
0375bb7945 [automerger skipped] Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd7474 am: 7ebc265975 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: Ic44b42a8f89e3cbd9d150ae36023d4a33605ff1a
 2021-06-17 00:08:57 +00:00
Beth Thibodeau
73280e0c91 [automerger skipped] [DO NOT MERGE] Fix layout for errorprone build am: 79709cfb41 am: 405bebefac -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: I9d4c836f8ccfc8c415a5d673ab2c3772bb794df1
 2021-06-17 00:08:55 +00:00
TreeHugger Robot
8d6651ac63 [automerger skipped] Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd7474 -s ours am: 1565aca2f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: I20d06c0957ab5309c5ab72189e84cc87e8ecdf0c
 2021-06-17 00:07:56 +00:00
Felipe Leme
60ec24eb1e Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev 2021-06-17 00:03:24 +00:00
Bill Lin
789f014c04 Merge "Allow one-handed mode shortcut expand notification" into sc-dev 2021-06-16 23:59:28 +00:00
TreeHugger Robot
1565aca2f8 [automerger skipped] Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd7474 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: I3e1a316aaf7e057905318ad5d221bd722d5a95b8
 2021-06-16 23:55:39 +00:00
TreeHugger Robot
7ebc265975 Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev am: b2c6cd7474 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: I7105158d2da8956cda07485b66676c10fe37cb4a
 2021-06-16 23:55:22 +00:00
Beth Thibodeau
405bebefac [DO NOT MERGE] Fix layout for errorprone build am: 79709cfb41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15003713

Change-Id: I7e9330b7fcd5430176fe1a5f324b9bf4ea11f28a
 2021-06-16 23:55:17 +00:00
Kevin Chyn
4e84b8849a Add BiometricActionDisabledByAdminController 
1) Adds UserManager#DISALLOW_BIOMETRIC. We actually need to
   pass a restriction from settings to ActionDisabledByAdmin area,
   otherwise the biometric-specific dialog would be shown outside of
   biometric flows.
2) Adds an interface to ActionDisabledByAdminController to return a
   optional OnClickListener for the positive dialog button
3) Returns an instance of the biometric controller when conditions
   are met
4) Adds string interfaces to DeviceAdminStringProvider to retrieve
   biometric-specific strings

Bug: 188847063
Bug: 191306258
Test: manual

Change-Id: Iaeffdeb1336d5db56d464104cdc7677b9021f609
 2021-06-16 16:41:14 -07:00
TreeHugger Robot
b2c6cd7474 Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev 2021-06-16 23:39:43 +00:00
TreeHugger Robot
d1c829f51e Merge "Coordinate circle reveal with authRipple" into sc-dev am: 603ade2fcc am: 1694f062d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982805

Change-Id: If8baacfcc36af73b98fc6e270c0c8a37d2ce31fb
 2021-06-16 23:16:30 +00:00
TreeHugger Robot
4dd37e330c Merge "Coordinate circle reveal with authRipple" into sc-dev am: 603ade2fcc am: 43ef04ef59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982805

Change-Id: I7e26cba2d0fe72db02dbaec0570586b7aef78f5c
 2021-06-16 23:08:41 +00:00
TreeHugger Robot
1694f062d5 Merge "Coordinate circle reveal with authRipple" into sc-dev am: 603ade2fcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982805

Change-Id: Ibd33889a830c4b7f003caa0e80125bcc726eb50b
 2021-06-16 22:59:43 +00:00
TreeHugger Robot
43ef04ef59 Merge "Coordinate circle reveal with authRipple" into sc-dev am: 603ade2fcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982805

Change-Id: I1177cce43b2f3d8c009de94427feb0a9b5effd39
 2021-06-16 22:58:59 +00:00
TreeHugger Robot
603ade2fcc Merge "Coordinate circle reveal with authRipple" into sc-dev 2021-06-16 22:42:56 +00:00
Humza Azam
16273c11ee Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a am: 3399307282 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14994638

Change-Id: I63a193f3353fada7dbb8283648108fe5e396f3ff
 2021-06-16 22:09:00 +00:00
Jorge Gil
cbac5c4ef4 Merge "Start pinchResize only if pointers are inside PIP" into sc-dev am: c6e212c5b2 am: d599c111a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948317

Change-Id: I74dd3fccc9f5e5ca697708612f7a604043c3575a
 2021-06-16 22:08:51 +00:00
John Reck
1ad13649ef Merge "Fix ripples not going away" into sc-dev am: 0d5d58a15f am: ba821a1a9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002973

Change-Id: I5472b6641133f3d4f6c8840327f4a47693c43e88
 2021-06-16 22:08:36 +00:00
Automerger Merge Worker
9082eb0ad3 Merge "Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a am: 42b5526aa2" into sc-v2-dev-plus-aosp 2021-06-16 22:08:28 +00:00
Automerger Merge Worker
91a63cbb62 Merge "Merge "Remove recommendations when setting is disabled" into sc-dev am: c1d7a61b2f am: 9cd3eb55ce" into sc-v2-dev-plus-aosp 2021-06-16 22:08:27 +00:00
Humza Azam
9722cacefc Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a am: 42b5526aa2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14994638

Change-Id: I15fd1320ec7a2723a0083f3c917de4465520796a
 2021-06-16 22:08:24 +00:00
Beth Thibodeau
313ab49834 Merge "Remove recommendations when setting is disabled" into sc-dev am: c1d7a61b2f am: 9cd3eb55ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14850802

Change-Id: I2c2e574a39877bad56efb28e22484d548257ecc5
 2021-06-16 22:08:21 +00:00
Jorge Gil
153d2538cf Merge "Start pinchResize only if pointers are inside PIP" into sc-dev am: c6e212c5b2 am: 2c8878f17b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948317

Change-Id: I588e7e4dd120b2c0aed21689af053463beb167ce
 2021-06-16 22:08:16 +00:00
John Reck
b5f595ce21 Merge "Fix ripples not going away" into sc-dev am: 0d5d58a15f am: e2459ddba9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002973

Change-Id: If90dc66740f3687b16199c968a90434b3c75250c
 2021-06-16 22:08:08 +00:00
Beth Thibodeau
6eadebf722 Merge "Remove recommendations when setting is disabled" into sc-dev am: c1d7a61b2f am: 2db99600b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14850802

Change-Id: I47b55b2e8f9c005ecb22b2429c93c06bb524f986
 2021-06-16 22:07:51 +00:00
Humza Azam
42b5526aa2 Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14994638

Change-Id: I34aeb3bf6e279e6fe7c577f97ae55cb34b0e373b
 2021-06-16 22:05:44 +00:00
Jorge Gil
2c8878f17b Merge "Start pinchResize only if pointers are inside PIP" into sc-dev am: c6e212c5b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948317

Change-Id: Iea52c31ae93d32087599e5b7d8f03b29ebb0e5af
 2021-06-16 22:04:50 +00:00
Humza Azam
3399307282 Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14994638

Change-Id: Iaa59f1656fbb70a4f775aa6a21654e4c8d47b093
 2021-06-16 22:04:31 +00:00
Jorge Gil
d599c111a7 Merge "Start pinchResize only if pointers are inside PIP" into sc-dev am: c6e212c5b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948317

Change-Id: I1744f1c6ce15ed67bf4dfb8f591eafcd2477e77a
 2021-06-16 22:04:14 +00:00
Humza Azam
83f88bc43a Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev 2021-06-16 22:03:08 +00:00