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

166704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Mark Renouf
5070b63f40 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 '2faa0c532c38cd171b9fa4843cb9ef43621f9f4e':
 2014-11-04 07:22:44 +00:00
kmccormick
0fc93ca3d7 am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'eac757a8a26ed4839aca716845fdec1d6ad0842f':
 2014-11-04 07:22:41 +00:00
Mark Renouf
2750e9ffe1 am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours 
* commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':
 2014-11-04 07:18:31 +00:00
Mark Renouf
2faa0c532c 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 '066f97e79bce5ac6722f44dcb411f9642c40026c':
 2014-11-04 07:18:28 +00:00
kmccormick
eac757a8a2 am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190 
* commit 'b2dfaf0ee621642190598b32b5ead861402b32ec':
 2014-11-04 07:18:24 +00:00
Mark Renouf
4cc7ae8038 If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours 
automerge: 01afc37  -s ours

* commit '01afc37403a244e75fbfa385b197d76e476213e8':
 2014-11-04 07:15:18 +00:00
Mark Renouf
066f97e79b Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da -s ours 
automerge: ff2e718  -s ours

* commit 'ff2e71830cafe063e876e5a56db0d33a8a5ba679':
 2014-11-04 07:14:17 +00:00
kmccormick
b2dfaf0ee6 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a 
automerge: 5298190

* commit '5298190a30288d29cb9107d89b00411def3e469b':
 2014-11-04 07:13:11 +00:00
Adam Lesinski
c953898b98 Fix issues that occurred due to building with clang 
Change-Id: I4fb3eb1c8d2a02312deaeebf4a0627153bf8700a
 2014-11-03 20:58:35 -08:00
Adam Lesinski
8a5bb15efa Fix automerge issue 
Duplicate method declaration.

Change-Id: I9355bd7c716e668ad7892fd12e93352455d149b5
 2014-11-03 20:35:54 -08:00
Adam Lesinski
b2808c03c3 Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp 2014-11-04 03:37:50 +00:00
Dongwon Kang
89ff872654 am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b 
* commit 'e2e7e9df8b8db998d9d2cb2e43eae84df3edad64':
  TIF: Fix a typo and remove an unused method in TvInputService
 2014-11-04 03:16:30 +00:00
Eric Laurent
12f6a11de6 am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f 
* commit '8e264a7703c79fff52dedcd867b9f134d93199f6':
  AudioService: fix cross deadlock
 2014-11-04 03:16:23 +00:00
David Friedman
f2764dd421 am 5880c9c2: am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs automerge: 6666f34 
* commit '5880c9c269b21799683bd153d10b605c9f011506':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 03:15:48 +00:00
Stuart Scott
a93dee63de am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89 
* commit '9017e0613271d35dc4ea1a011268e1cf0165c907':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:15:41 +00:00
Dongwon Kang
e2e7e9df8b Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 
automerge: 085329b

* commit '085329b69abc0751591f99faf8a7e8fc2dc7c9df':
  TIF: Fix a typo and remove an unused method in TvInputService
 2014-11-04 03:07:00 +00:00