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

158332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
534495c7a9 am 6fd88022: Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev 
* commit '6fd88022c286730b6f17917dff2d9dd2d74bbfee':
  Fix jump in two-finger expand motion with no notifications
 2014-11-04 16:58:23 +00:00
Jorim Jaggi
6fd88022c2 Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev 2014-11-04 16:54:12 +00:00
Adrian Roos
a5dd432c08 am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 
* commit 'e94a84d2a78edd9f1b92d69aca361bc3affc1cfe':
  Refactor LockSettingsService into storage and logic
 2014-11-04 16:45:49 +00:00
Adrian Roos
e94a84d2a7 Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 2014-11-04 16:40:38 +00:00
Adrian Roos
261d5ab8f4 Refactor LockSettingsService into storage and logic 
Creates a new LockSettingsStorage class to handle
stroring and retreiving data.

Bug: 18163444
Change-Id: Ia3bc4ad679c5e1217756ae6b3b80cfce3599baed
 2014-11-04 17:38:20 +01:00
John Spurlock
df80f1c92b am 8c4aad50: Merge "QS: Create the tile background once per tile." into lmp-mr1-dev 
* commit '8c4aad505a0034b89abbdd7e11c18ffe11756c5f':
  QS: Create the tile background once per tile.
 2014-11-04 16:30:01 +00:00
John Spurlock
8c4aad505a Merge "QS: Create the tile background once per tile." into lmp-mr1-dev 2014-11-04 16:26:14 +00:00
Griff Hazen
07e8b2fb74 am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '9c95015b0ccaa02b97b4c96950e2b07e6a5a7b4e':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:28:14 +00:00
Rob Tsuk
c4aea977cd am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit 'e6c0bda5dd945f3668b4108c49ee52f1a04253d6':
  Make points drawn with default paint visible
 2014-11-04 15:23:59 +00:00
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
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
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
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
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
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
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
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
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
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
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
Eric Laurent
8e264a7703 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 
automerge: 8befd6f

* commit '8befd6fd051e3c5d7c8e4c804664b8c69f91335a':
  AudioService: fix cross deadlock
 2014-11-04 03:05:27 +00:00
David Friedman
5880c9c269 am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs 
automerge: 6666f34

* commit '6666f34c9b6617b0f9ac3915a05b01f19cb8ac22':
  Fixed ADB documentation to work properly on Windows Bug: 17192985
 2014-11-04 03:03:46 +00:00
Stuart Scott
9017e06132 Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev 
automerge: b600d89

* commit 'b600d890a606692b319efbd0222c7c60a6b45b9f':
  Clean up public API of SubInfoRecord.
 2014-11-04 03:02:25 +00:00
Alan Viverette
b4f8a98176 Default gradient radius to %p when no intrinsic width or height set 
BUG: 18224018
Change-Id: I05cbe3023d0a5e6813658063d3a3633c6ddd8d96
 2014-11-03 18:45:23 -08:00
Dongwon Kang
085329b69a Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 2014-11-04 02:41:54 +00:00
Alan Viverette
5ecbfeb38b Always update date picker position after change in range 
BUG: 18204507
Change-Id: Id3ae11cdb68f60901a3145ebd93f3acbbccd71d2
 2014-11-03 18:31:36 -08:00