drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,071 Commits 1 Branch 0 Tags
Commit Graph

172071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
9c95015b0c Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 2014-11-04 15:23:21 +00:00
Rob Tsuk
e6c0bda5dd Merge "Make points drawn with default paint visible" into lmp-mr1-dev 2014-11-04 15:20:00 +00:00
Jorim Jaggi
0cce70c9fa Fix jump in two-finger expand motion with no notifications 
Bug: 18185048
Change-Id: Ib54789e45b7b68a5fc9d6056cb53de23b2be3260
 2014-11-04 16:13:41 +01:00
Jorim Jaggi
8b54483f4f am 1cb02d93: am b1be947a: am 1482b053: Merge "Update QS tile states after unlocking" into lmp-mr1-dev 
* commit '1cb02d935571c128c906a5fc72a60a62d8d6857d':
  Update QS tile states after unlocking
 2014-11-04 14:46:15 +00:00
Jorim Jaggi
498637a166 am c821492b: am cd1752ee: am 8289301c: Merge "Always update quick settings header translation in onLayout" into lmp-mr1-dev 
* commit 'c821492bcf5087175c7dd554f7e715f953767482':
  Always update quick settings header translation in onLayout
 2014-11-04 14:42:14 +00:00
Jorim Jaggi
1cb02d9355 am b1be947a: am 1482b053: Merge "Update QS tile states after unlocking" into lmp-mr1-dev 
* commit 'b1be947a70d2a1ae755405d2ebb38c5e9a104889':
  Update QS tile states after unlocking
 2014-11-04 14:42:11 +00:00
John Spurlock
31798f17b1 QS: Create the tile background once per tile. 
Bug: 18219320
Change-Id: I15cbb7623c3e81b724fb0c4e830ae4e6615552dc
 2014-11-04 09:41:32 -05:00
Jorim Jaggi
c821492bcf am cd1752ee: am 8289301c: Merge "Always update quick settings header translation in onLayout" into lmp-mr1-dev 
* commit 'cd1752eee65e7795eb723c8bc2998072ec8f5888':
  Always update quick settings header translation in onLayout
 2014-11-04 14:38:05 +00:00
Adrian Roos
4a38beac17 am 78ac6b29: am c2a809b1: am ad3bc7f8: Fix a keyguard charging status 
* commit '78ac6b296d7509b650a90000a38001a4251e8c3d':
  Fix a keyguard charging status
 2014-11-04 14:38:04 +00:00
Adrian Roos
22e7649733 am c0fabb0c: am ead47adc: am c0f0a747: Fix low profile bar mode for Material themed apps 
* commit 'c0fabb0cb9e3098055d5a3f1d8e7159128cea281':
  Fix low profile bar mode for Material themed apps
 2014-11-04 14:38:00 +00:00
Jorim Jaggi
b1be947a70 am 1482b053: Merge "Update QS tile states after unlocking" into lmp-mr1-dev 
* commit '1482b0535e1708fbf9914946abe59c36f39633e7':
  Update QS tile states after unlocking
 2014-11-04 14:37:38 +00:00
Adrian Roos
78ac6b296d am c2a809b1: am ad3bc7f8: Fix a keyguard charging status 
* commit 'c2a809b1afae2077756fdf11af4ac5d466fa6d9a':
  Fix a keyguard charging status
 2014-11-04 14:33:14 +00:00
Adrian Roos
c0fabb0cb9 am ead47adc: am c0f0a747: Fix low profile bar mode for Material themed apps 
* commit 'ead47adcb6ee5845b676aba228b1818592ecab65':
  Fix low profile bar mode for Material themed apps
 2014-11-04 14:33:08 +00:00
Jorim Jaggi
cd1752eee6 am 8289301c: Merge "Always update quick settings header translation in onLayout" into lmp-mr1-dev 
* commit '8289301c74ffb0076d993dc58cb05fa0e2ed2ff6':
  Always update quick settings header translation in onLayout
 2014-11-04 14:33:01 +00:00
Jorim Jaggi
1482b0535e Merge "Update QS tile states after unlocking" into lmp-mr1-dev 2014-11-04 14:31:46 +00:00
Adrian Roos
c2a809b1af am ad3bc7f8: Fix a keyguard charging status 
* commit 'ad3bc7f878ace1a0eb6f73466d55d9d7b060e48c':
  Fix a keyguard charging status
 2014-11-04 14:28:36 +00:00
Adrian Roos
ead47adcb6 am c0f0a747: Fix low profile bar mode for Material themed apps 
* commit 'c0f0a74762f7b3651d0fcd8371e9eb0c84779b1a':
  Fix low profile bar mode for Material themed apps
 2014-11-04 14:28:31 +00:00
Jorim Jaggi
8289301c74 Merge "Always update quick settings header translation in onLayout" into lmp-mr1-dev 2014-11-04 14:27:50 +00:00
Adrian Roos
ad3bc7f878 Fix a keyguard charging status 
Fixes a bug where the keyguard was showing
a charging state even though the device was
not plugged in.

Bug: 18166083
Change-Id: I85a2cda674ffdafb37df70598f4028414a639def
 2014-11-04 14:18:16 +00:00
Adrian Roos
c0f0a74762 Fix low profile bar mode for Material themed apps 
Bug: 17691219
Change-Id: I1b1fb2e831e5d4c41073bb4db0793bf66468c4c4
 2014-11-04 14:16:16 +00:00
John Spurlock
c0d6eb540c am 6a585261: am dde73641: am d94017b0: Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev 
* commit '6a585261dc45c55cb1b47476e9a07ca47a7c59f7':
  QS: New rotation-lock tile icon, using AVDs.
 2014-11-04 12:27:42 +00:00
John Spurlock
6a585261dc am dde73641: am d94017b0: Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev 
* commit 'dde73641fd3f29d777f531d3ea2b839b9e9b0b40':
  QS: New rotation-lock tile icon, using AVDs.
 2014-11-04 12:23:21 +00:00
John Spurlock
dde73641fd am d94017b0: Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev 
* commit 'd94017b0c26471461f668badb2584df0026da1a8':
  QS: New rotation-lock tile icon, using AVDs.
 2014-11-04 12:19:24 +00:00
John Spurlock
d94017b0c2 Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev 2014-11-04 12:15:10 +00:00
Nicolas Prevot
05ca5e4909 am ca97de91: am 20519367: am 8da8ab5c: Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev 
* commit 'ca97de917f5d5baa70a4a8b657a98cac365c8aff':
  An intent forwarded from a chooser intent will be a chooser too.
 2014-11-04 11:20:28 +00:00
Nicolas Prevot
ca97de917f am 20519367: am 8da8ab5c: Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev 
* commit '205193675fa2e09870c4962405b30e18ab47e3e6':
  An intent forwarded from a chooser intent will be a chooser too.
 2014-11-04 11:15:50 +00:00
Nicolas Prevot
205193675f am 8da8ab5c: Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev 
* commit '8da8ab5cf2a7faae5691d1e7cd84dfacc7e8cf33':
  An intent forwarded from a chooser intent will be a chooser too.
 2014-11-04 11:11:51 +00:00
Nicolas Prevot
8da8ab5cf2 Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev 2014-11-04 11:08:19 +00:00
Nicolas Prevot
f6319c7e78 am b01a483e: am 7ca8674f: am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 
* commit 'b01a483e64a1beab6eb680c82ab472ed159e394d':
  Do not fix uris inside the system.
 2014-11-04 10:59:40 +00:00
Nicolas Prevot
b01a483e64 am 7ca8674f: am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 
* commit '7ca8674f66047c409031f3c5e4590c97c62f910d':
  Do not fix uris inside the system.
 2014-11-04 10:55:26 +00:00
Nicolas Prevot
7ca8674f66 am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 
* commit 'ac7774e8c13e5e2881a588012b8710ad3947169c':
  Do not fix uris inside the system.
 2014-11-04 10:51:13 +00:00
Nicolas Prevot
ac7774e8c1 Merge "Do not fix uris inside the system." into lmp-mr1-dev 2014-11-04 10:47:25 +00:00
Sander Alewijnse
9ce0139473 am 654fcad7: am 9ceafdb7: am 47ffc605: Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev 
* commit '654fcad705a6de54d22219a416c57b3d16ab0d3a':
  Show message when intent is forwarded across profiles.
 2014-11-04 10:40:23 +00:00
Sander Alewijnse
654fcad705 am 9ceafdb7: am 47ffc605: Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev 
* commit '9ceafdb79473e28173e523bda8b1bc7982907726':
  Show message when intent is forwarded across profiles.
 2014-11-04 10:35:02 +00:00
Sander Alewijnse
9ceafdb794 am 47ffc605: Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev 
* commit '47ffc60578caf0caaf703293a3e96883f6ea5db2':
  Show message when intent is forwarded across profiles.
 2014-11-04 10:30:12 +00:00
Sander Alewijnse
47ffc60578 Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev 2014-11-04 10:24:28 +00:00
Narayan Kamath
f47a6db44b am f2196a6e: am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit 'f2196a6ed5988f87d0e04cc30f0f82f7ea431095':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:16:22 +00:00
Narayan Kamath
f2196a6ed5 am 6220810b: am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit '6220810b8167deee7bf2577f5136736473cbea1c':
  Remove deprecated DateFormat APIs.
 2014-11-04 10:08:53 +00:00
Narayan Kamath
6220810b81 am 78a3b7d5: Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 
* commit '78a3b7d5af8ca97cf31e792dcebb9bfd0b750475':
  Remove deprecated DateFormat APIs.
 2014-11-04 09:59:02 +00:00
Narayan Kamath
78a3b7d5af Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev 2014-11-04 09:48:19 +00:00
Mark Renouf
32e61bfbbd am 11f8e16c: (-s ours) am 0de22729: am c2a667cc: am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '11f8e16c410dd7fc22619d3595ab582280eec67a':
 2014-11-04 07:37:33 +00:00
Mark Renouf
fab59b43c8 am 9c94fa32: (-s ours) am ff78b4b0: am 5070b63f: am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit '9c94fa32b83a89e11e419f2c37c1cae026322559':
 2014-11-04 07:37:29 +00:00
kmccormick
de65593b16 am cebc24f5: am 343eba12: am 0fc93ca3: am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'cebc24f5b659fad2d9a5258c0b52688a8ead2aa9':
 2014-11-04 07:37:25 +00:00
Mark Renouf
11f8e16c41 am 0de22729: am c2a667cc: am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '0de22729da8c2549c331a1ccd1ca462f56be465d':
 2014-11-04 07:33:52 +00:00
Mark Renouf
9c94fa32b8 am ff78b4b0: am 5070b63f: am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit 'ff78b4b0057dba07924ea95efc3e173963a3aba0':
 2014-11-04 07:33:47 +00:00
kmccormick
cebc24f5b6 am 343eba12: am 0fc93ca3: am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit '343eba1283d29160513f543734664ddbf607be01':
 2014-11-04 07:33:42 +00:00
Mark Renouf
0de22729da am c2a667cc: am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit 'c2a667cc4e0607bc33248299bde6f9821de25ac1':
 2014-11-04 07:28:23 +00:00
Mark Renouf
ff78b4b005 am 5070b63f: am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours automerge: ff2e718 -s ours 
* commit '5070b63f40a0296a6938524f5201842c37c6f685':
 2014-11-04 07:28:18 +00:00
kmccormick
343eba1283 am 0fc93ca3: am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit '0fc93ca3d715d132343a335a15486de142196885':
 2014-11-04 07:28:13 +00:00
Mark Renouf
c2a667cc4e am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae':
 2014-11-04 07:22:48 +00:00