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

651399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jorge Gil
c6e212c5b2 Merge "Start pinchResize only if pointers are inside PIP" into sc-dev 2021-06-16 21:59:53 +00:00
John Reck
ba821a1a9f Merge "Fix ripples not going away" into sc-dev am: 0d5d58a15f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002973

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

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

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

Change-Id: Ia02804bdb3256908a31c375a32f287d5a218f6f1
 2021-06-16 21:55:04 +00:00
John Reck
0d5d58a15f Merge "Fix ripples not going away" into sc-dev 2021-06-16 21:47:34 +00:00
Beth Thibodeau
c1d7a61b2f Merge "Remove recommendations when setting is disabled" into sc-dev 2021-06-16 21:26:45 +00:00
Sunny Goyal
aec638765e Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev am: c0b53c93a2 am: cb49b01f16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968417

Change-Id: I8f9a9e965f6803e5ea36a92d5f65732182b0d41e
 2021-06-16 21:24:10 +00:00
Beth Thibodeau
79709cfb41 [DO NOT MERGE] Fix layout for errorprone build 
0dp width caused an error because there was no weight. Since this should
never be visible anyways, changed to wrap_content and visibility gone

Bug: 190505997
Test: visual, builds
Change-Id: I6ad5f50b03df78f014c59a201853b290061f9021
 2021-06-16 21:11:04 +00:00
Sunny Goyal
cb49b01f16 Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev am: c0b53c93a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968417

Change-Id: I03e0bde00811d221ff36c25b3c0a0e22b465d03d
 2021-06-16 21:06:56 +00:00
Sunny Goyal
659349d7eb Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev am: c0b53c93a2 am: 915745d179 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968417

Change-Id: Id68eb440d9a2e5ef31429a457a0bd6107ead2ca0
 2021-06-16 20:59:30 +00:00
Mady Mellor
d53a1b025c Merge "Fix tests - needed a reasonable max set in bubble positioner" into sc-dev am: 4de2f90856 am: 8b1c336522 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002365

Change-Id: Ieceeee795e70ec497e77445b5f0428523276fbbb
 2021-06-16 20:59:20 +00:00
TreeHugger Robot
abe79fc170 Merge "Exempt some callers from min-window restrictions" into sc-dev am: 916a356f71 am: 958a05c7df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14988270

Change-Id: Ia8dfec4cabb22ccfb7131fde5f73aefdd2dd2687
 2021-06-16 20:58:32 +00:00
Caitlin Cassidy
a08ce66a23 Merge "[Status Bar] Fix NPE in #dumpBarTransitions." into sc-dev am: ae8d7cff27 am: 323873e74a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997041

Change-Id: Ie6a8e42d66502b7df523929a2942374b91968372
 2021-06-16 20:58:19 +00:00
Automerger Merge Worker
5803ff6406 Merge "Merge "Fix tests - needed a reasonable max set in bubble positioner" into sc-dev am: 4de2f90856" into sc-dev-plus-aosp am: f03017c78c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002365

Change-Id: I8a9e9fd7a007472b67e7bea139c4bd4ec0098be1
 2021-06-16 20:54:43 +00:00
Automerger Merge Worker
f903c83203 Merge "[automerger skipped] Merge "Convert VcnNetworkProvider to use NetworkOffers" am: e98c98156c am: 65995498c4 -s ours" into sc-dev-plus-aosp am: bea8533c28 -s ours 
am skip reason: Merged-In I88c69c0be9f6fd81839fb1595ed00341001694a5 with SHA-1 9dfb804a4e is already in history

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

Change-Id: I34ef4b4faa843abd372233e4f5a20209def1b66e
 2021-06-16 20:54:01 +00:00
TreeHugger Robot
a9a5747269 Merge "Exempt some callers from min-window restrictions" into sc-dev am: 916a356f71 am: f2522e992b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14988270

Change-Id: I543d83c03b1f24999b05ad774ce6db9e8be1aa5a
 2021-06-16 20:53:43 +00:00
Sunny Goyal
915745d179 Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev am: c0b53c93a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14968417

Change-Id: Ib22e1b5bd86e8c867eca6529811d4720e8e4d1bc
 2021-06-16 20:53:00 +00:00
Caitlin Cassidy
5c70c4f46f Merge "[Status Bar] Fix NPE in #dumpBarTransitions." into sc-dev am: ae8d7cff27 am: 1702769b29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997041

Change-Id: I42a1a241e1cb0a79cca80b7b7c42fc3d0d4b27d1
 2021-06-16 20:52:58 +00:00
Humza Azam
32eef1d580 Revert "Revert "Revert "HULK SMASH! We've gotta declare REL.""" 
This reverts commit 67f28e7448.

Reason for revert: Testing fix for b/191191441

Bug: 191191441
Change-Id: I15ca686c7c44626b734ba45e785adbe66fcf624a
 2021-06-16 20:51:30 +00:00
Sunny Goyal
c0b53c93a2 Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev 2021-06-16 20:51:13 +00:00
Mady Mellor
8b1c336522 Merge "Fix tests - needed a reasonable max set in bubble positioner" into sc-dev am: 4de2f90856 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002365

Change-Id: Ibbf649e9a2713b694da2719fdc14d7e5de4e83ed
 2021-06-16 20:43:38 +00:00
TreeHugger Robot
958a05c7df Merge "Exempt some callers from min-window restrictions" into sc-dev am: 916a356f71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14988270

Change-Id: I27a3da33f59f8ba6a914bbe5a6b53d8eb09d9a23
 2021-06-16 20:43:32 +00:00