Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561,735 Commits 3 Branches 0 Tags
488ac616fe222f0da0a42e43ea3581efe63cece0
Commit Graph

33903 Commits

Author SHA1 Message Date
TreeHugger Robot
5608dc529b Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: 9c0ada2858 am: dafdfb6ea1 am: 83ef0b8ed8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I3878b9308b41f069548f987382021f19679c2aed
 2020-06-19 00:26:16 +00:00
TreeHugger Robot
dafdfb6ea1 Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: 9c0ada2858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I1e3165fcf852e96653f0aedef2e79093d66fd0e1
 2020-06-18 23:55:29 +00:00
TreeHugger Robot
9c0ada2858 Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914976

Change-Id: I011f20bfa317c7f2431613769cd3567245d2a973
 2020-06-18 23:39:35 +00:00
TreeHugger Robot
853ee37937 Merge "Remove BubbleEntity via IDs" into rvc-dev 2020-06-18 23:26:48 +00:00
TreeHugger Robot
decf56fc22 Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4 am: f42cbc831a am: 4829436fc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: Ic37b62d31bfa1757e75422b32dfd6c73c2e335e6
 2020-06-18 23:11:08 +00:00
TreeHugger Robot
4829436fc3 Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4 am: f42cbc831a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: Ida5025f58156e77e427aa9f2d1649eb6a380080a
 2020-06-18 22:53:59 +00:00
TreeHugger Robot
9300ff96a3 Merge "More defensive checks for ProximitySensor" into rvc-d1-dev am: 8ce8c004a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893834

Change-Id: I9d25209a52281020f9721b1aaafaad712a29f900
 2020-06-18 22:35:49 +00:00
Automerger Merge Worker
506c4900d3 Merge "Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497b6 am: 19151c4eaa am: 0a1df84b4f" into rvc-qpr-dev-plus-aosp am: 2d2b2ea6f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916179

Change-Id: I0f79f91f16f42e5ed606813d69b85ac6a2e5e531
 2020-06-18 22:33:55 +00:00
TreeHugger Robot
06fd035127 Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 am: fd4448ac32 am: 6e7b0d96e6 am: 94bd5bb34a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11919891

Change-Id: I7a2b42920a9ace4e960202558c14f4d8481a06d5
 2020-06-18 22:29:06 +00:00
TreeHugger Robot
8ce8c004a4 Merge "More defensive checks for ProximitySensor" into rvc-d1-dev 2020-06-18 22:26:43 +00:00
Santhosh Thangaraj
c46a9fad94 Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497b6 am: 19151c4eaa am: 0a1df84b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916179

Change-Id: I24b7e63ec7cf4c3867e3b22a8042ba17e12a0156
 2020-06-18 22:03:33 +00:00
Santhosh Thangaraj
61f150d640 Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497b6 am: ca6bf47a9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916179

Change-Id: I1eacd4134ace604f8d3597c18d8f40daf0f80c4e
 2020-06-18 22:02:04 +00:00
Mady Mellor
4e775a33ac Remove BubbleEntity via IDs 
The contents of the BubbleEntity could differ
so should compare via IDs

Fixes: 159041180
Test: atest BubbleVolatileRepositoryTest
Change-Id: I6470a484657710cff3b2cdc0787cd0afcfdbb6ad
 2020-06-18 14:54:17 -07:00
Santhosh Thangaraj
ca6bf47a9c Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916179

Change-Id: I1f903dcb242793118bce50cb9dae79d2d5de2f80
 2020-06-18 21:49:07 +00:00
Santhosh Thangaraj
19151c4eaa Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev am: b0bc7497b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916179

Change-Id: I0c3aaa715043ab8c1818917913d9334b7a564f61
 2020-06-18 21:48:56 +00:00
Santhosh Thangaraj
b0bc7497b6 Merge "Fix the gold highlight encircles the app badge in the bubble." into rvc-dev 2020-06-18 21:44:55 +00:00
Automerger Merge Worker
b2a2148e0c Merge "Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069 am: 73cf407d05" into rvc-qpr-dev-plus-aosp am: 2b35012e79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: Ie675df688032e19b2f0aafdda524ddefa3e781e6
 2020-06-18 21:40:10 +00:00
TreeHugger Robot
9bb67222a6 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: dea05a61f1 am: fde816b3e2 am: 69f6f7999c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: I17764172c2f5997dbd3d3b444cba2b971ccddf96
 2020-06-18 21:38:54 +00:00
Fabian Kozynski
8e282b630e Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 9d4f06e16e am: d20f314b51 am: 8a1396cfd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I8ef2ca6c69c22c902f6c1391883350dd3898dee3
 2020-06-18 21:37:29 +00:00
TreeHugger Robot
6e7b0d96e6 Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 am: fd4448ac32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11919891

Change-Id: I221f1edef32a2840ab3235eb603221c30a36689c
 2020-06-18 21:37:16 +00:00
TreeHugger Robot
4d971a7ab7 Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11919891

Change-Id: I5f967484ba390332f64083405137615fc97e9354
 2020-06-18 21:23:05 +00:00
TreeHugger Robot
fd4448ac32 Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11919891

Change-Id: I993b739f8d58c7a1250a907097439b7d4c138056
 2020-06-18 21:22:49 +00:00
Lucas Dupin
84ffc64020 Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069 am: 73cf407d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: Ib9595c3f029a54ca61ecc62809194859295a72fa
 2020-06-18 21:18:38 +00:00
TreeHugger Robot
a7143d54c7 Merge "Controls UI - Do not update while drag in progress" into rvc-dev 2020-06-18 21:06:25 +00:00
Lucas Dupin
91bcf9529f Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: Ia64188ec693e2595eab40bdbf2e3ee2714eb8b04
 2020-06-18 20:59:24 +00:00
TreeHugger Robot
fde816b3e2 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: dea05a61f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: Id5bb76d30afca27d7d2be0659b5994a6bbed94d7
 2020-06-18 20:59:10 +00:00
Fabian Kozynski
d20f314b51 Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 9d4f06e16e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: Ic91b6a8020c4fe73273b407eb1ffd0271d08a830
 2020-06-18 20:58:42 +00:00
Lucas Dupin
84f8d7602f Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: I67939a3741b21b48eecc1402d848cf3acef42467
 2020-06-18 20:51:57 +00:00
Lucas Dupin
8d4b42a069 Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: I2ba16cb8e34ba0e4ed6012884fcca426bb50fbab
 2020-06-18 20:51:21 +00:00
TreeHugger Robot
eebb93f449 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: I41ad1dbc1807cae0d302c515a44b871c4a238142
 2020-06-18 20:51:13 +00:00
TreeHugger Robot
dea05a61f1 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: I1095b76ff7e366e432bf8a449346547414f4a82c
 2020-06-18 20:51:03 +00:00
Lucas Dupin
fe16654f21 Merge "Do not dismiss notification, flip activity flag" into rvc-dev 2020-06-18 20:48:32 +00:00
TreeHugger Robot
e93d99c647 Merge "Resumption player colorized from the album art" into rvc-dev 2020-06-18 20:48:13 +00:00
Fabian Kozynski
74982485c7 Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I34ddfe97270f2a493f86c638e9f9a2a3eb681a8b
 2020-06-18 20:44:12 +00:00
Fabian Kozynski
9d4f06e16e Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I0c8ec576bf3ec6a43b86b58d0c25dff969004560
 2020-06-18 20:43:59 +00:00
TreeHugger Robot
00d19a3c2d Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a am: a1a8fc3806 am: 116537e5fd am: 417be91d76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: I439b96070ad40cde265a934018ed00f4c0805b92
 2020-06-18 20:39:22 +00:00
Automerger Merge Worker
d173bc37bb Merge "Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 7986672c6f am: c06c8f9f02" into rvc-qpr-dev-plus-aosp am: 3c9bf33ee5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: I1d099a1f39e0ca2364051a8230c3549821d78d8b
 2020-06-18 20:39:10 +00:00
Alex Mang
41f94e585f Merge changes from topic "feedback" 
* changes:
  Flag guarding all notification feedback UI
  Adding automatic option in long press menu
  Adding notification guts to feedback icon
  Add notification feedback indicator icon.
 2020-06-18 20:38:37 +00:00
Aran Ink
a2fcab9016 Merge "Convert PowerOptions menu into a dialog and update styling." into rvc-dev am: ee441db39f am: 8537f384e7 am: 41848a381e am: e25d565f9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886960

Change-Id: Iee52075d0f1514da27115bd83356384d54e83e5a
 2020-06-18 20:36:03 +00:00
Fabian Kozynski
5a7e06187d Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev 2020-06-18 20:33:15 +00:00
TreeHugger Robot
417be91d76 Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a am: a1a8fc3806 am: 116537e5fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: If1bc92fe16c9f6e089f014760b893043f253c55b
 2020-06-18 20:27:56 +00:00
TreeHugger Robot
2ee3885368 Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 7986672c6f am: c06c8f9f02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: I36daec58328a13c6fadb4230a7629d5923735a0e
 2020-06-18 20:27:39 +00:00
TreeHugger Robot
be5745669a Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a am: a1a8fc3806 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: Iafd380327e74bc7d938b66e09d80e1f21877188b
 2020-06-18 20:13:52 +00:00
TreeHugger Robot
857ef08a54 Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 7986672c6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: Id9a4bed0547beb08fcc239d6a3f876440b5d929f
 2020-06-18 20:13:33 +00:00
TreeHugger Robot
aaca11c5e9 Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: Ie0b2328dfc25a10b09edcec19f4fcc885e7addca
 2020-06-18 19:56:55 +00:00
TreeHugger Robot
a1a8fc3806 Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: I0c2142da15c68090a5bb5bea66636991daa1ef8e
 2020-06-18 19:56:51 +00:00
TreeHugger Robot
4dcd6ee8ac Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: I1f2d8e7eb3ba2100b6d34a01bbfcdf5f9963dfe1
 2020-06-18 19:56:35 +00:00
TreeHugger Robot
7986672c6f Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: I3f6ace34a26ad554161e746cdbf3a775a2287420
 2020-06-18 19:56:31 +00:00
TreeHugger Robot
f8b08dfa4a Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev 2020-06-18 19:54:00 +00:00
Aran Ink
e25d565f9b Merge "Convert PowerOptions menu into a dialog and update styling." into rvc-dev am: ee441db39f am: 8537f384e7 am: 41848a381e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886960

Change-Id: I2bdcc7a1afb8b06fa4fdc59fe48700cf05d8a6fa
 2020-06-18 19:50:38 +00:00