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

166783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
61f91724a9 Merge "docs: Fix the circularReveal example." into lmp-docs 2014-11-04 17:56:22 +00:00
Eric Laurent
d9764f1c23 am 13e4928a: am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit '13e4928a49f6e86b5dd8c5a34b38550f110f1e99':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:09:57 +00:00
Eric Laurent
13e4928a49 am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit 'fe91d4e6a2ef4e51910965ea258f91c14f5ee0dc':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:06:18 +00:00
Jorim Jaggi
a8cee1800c am 534495c7: am 6fd88022: Merge "Fix jump in two-finger expand motion with no notifications" into lmp-mr1-dev 
* commit '534495c7a98b7d35d9859f663522bd6af047b4dd':
  Fix jump in two-finger expand motion with no notifications
 2014-11-04 17:03:07 +00:00
Eric Laurent
fe91d4e6a2 Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 2014-11-04 17:02:25 +00:00
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
7515c18667 am a5dd432c: am e94a84d2: Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev 
* commit 'a5dd432c088487374c08395aed98c7eacdfa791a':
  Refactor LockSettingsService into storage and logic
 2014-11-04 16:50:28 +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
fbca0e8455 am df80f1c9: am 8c4aad50: Merge "QS: Create the tile background once per tile." into lmp-mr1-dev 
* commit 'df80f1c92be7446895b98f28e1c1d7c7649ba399':
  QS: Create the tile background once per tile.
 2014-11-04 16:34:15 +00: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
472b990ae1 am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev 
* commit '07e8b2fb7409f0893d13a6cfb4687ba70b220e91':
  Improve support for the barcode-on-screen use case for wearables.
 2014-11-04 15:33:17 +00:00
Rob Tsuk
6bd8d825b2 am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit 'c4aea977cd35c423132382cf0ae1f3238e2c7d10':
  Make points drawn with default paint visible
 2014-11-04 15:29:10 +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
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
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