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

159141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renato Mangini
46112fe18b am 7e582533: am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page. 
* commit '7e582533f37eb11c0036ade8bd221bf518e38471':
  Add new samples to what's new page.
 2014-11-13 21:05:26 +00:00
Renato Mangini
7e582533f3 am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page. 
* commit 'ee291ca2ce4092aaae556ebda46daf7337506f74':
  Add new samples to what's new page.
 2014-11-13 20:58:03 +00:00
John Spurlock
1a68ba6b85 am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev 
* commit '338bc5a41854d40dfb35ec2865024d3b2737a864':
  Zen: Update condition text for current condition.
 2014-11-13 20:26:11 +00:00
Jeff Sharkey
3f8b53cc62 am 51151dcc: Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev 
* commit '51151dcc9498232452e69e945ce6322ef8a77d44':
  Make package verifier broadcasts foreground.
 2014-11-13 20:21:56 +00:00
John Spurlock
338bc5a418 Merge "Zen: Update condition text for current condition." into lmp-mr1-dev 2014-11-13 20:20:25 +00:00
Jeff Sharkey
51151dcc94 Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev 2014-11-13 20:17:32 +00:00
Jeff Sharkey
13cf7917af Make package verifier broadcasts foreground. 
We're using ordered broadcasts (sigh!) for package verification, and
we could be stuck behind dozens of other background broadcasts, so
hoist into foreground queue.

Bug: 18356768
Change-Id: Ib4abf771db0147f8fbd7227f32297602816c84ae
 2014-11-13 12:14:30 -08:00
Simranjit Singh Kohli
91b5550ee7 am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 
* commit 'fdcdb7429e3f150818e8df561a62328444b102c5':
  [RemoveAccount API]: Adding support for intent.
 2014-11-13 19:24:10 +00:00
Simranjit Singh Kohli
fdcdb7429e Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 2014-11-13 19:18:30 +00:00
Wale Ogunwale
21f16a475d am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 
* commit '28d3c245a1dde4aa5294192bec9980d8a93b0489':
  Cancel or drop key events if activity is stopped.
 2014-11-13 19:07:19 +00:00
Wale Ogunwale
28d3c245a1 Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 2014-11-13 19:00:07 +00:00
Jean-Michel Trivi
84c803f85d am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev 
* commit '136f54153e412485feae39cf3fe86392f01a2bd6':
  Support for delayed audio focus
 2014-11-13 18:57:49 +00:00
Adam Powell
e2820ed963 am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 
* commit '87bc2acfd3e874ff94fd3da948c329d2547a2bfc':
  Optimize setting padding and backgrounds for views
 2014-11-13 18:57:43 +00:00
Jean-Michel Trivi
136f54153e Merge "Support for delayed audio focus" into lmp-mr1-dev 2014-11-13 18:47:34 +00:00
Adam Powell
87bc2acfd3 Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 2014-11-13 18:12:54 +00:00
RoboErik
9e0707155f am f338fcba: Merge "Use the suggested stream if it\'s currently active" into lmp-mr1-dev 
* commit 'f338fcbae53987a5db77b774049d1128964fe880':
  Use the suggested stream if it's currently active
 2014-11-13 18:00:26 +00:00
Mike Lockwood
0181664081 am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit 'eb205b8819406e96b7d3fa5e79009155260336e8':
  MTP: Update JNI for new packet getters
 2014-11-13 17:56:07 +00:00
RoboErik
f338fcbae5 Merge "Use the suggested stream if it's currently active" into lmp-mr1-dev 2014-11-13 17:55:06 +00:00
Mike Lockwood
eb205b8819 Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 2014-11-13 17:52:02 +00:00
Mike Lockwood
9c803fa526 MTP: Update JNI for new packet getters 
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
 2014-11-13 09:40:42 -08:00
Jorim Jaggi
c1bb86200d am a77a37c4: Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev 
* commit 'a77a37c48a00744d6a753172516a2c7f5f2a9004':
  Fix doze jank by removing a fullscreen layer of overdraw
 2014-11-13 17:05:12 +00:00
Jorim Jaggi
a77a37c48a Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev 2014-11-13 17:02:18 +00:00
Jorim Jaggi
048af1f727 Fix doze jank by removing a fullscreen layer of overdraw 
Move all doze related stuff into DozeScrimController, and combine
both alpha values from the regular ScrimController and
DozeScrimController before applying it to a view. Move the black
background from NotificationPanelView to DozeScrimController, which
saves a fullscreen layer of overdraw during the transition.

Bug: 18238168
Change-Id: Ifb133bf4a0f8255f5c2f5e205509af339cac8c8f
 2014-11-13 17:54:21 +01:00
Jorim Jaggi
76c234c8df am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 
* commit 'd0d23c80dae34a126c8024748554a5d07bf3291c':
  Fix wrong states when waking up from doze via touch
 2014-11-13 16:50:53 +00:00
Craig Mautner
316e369c4c am 30bd3bb7: Revert "Debug for bug 18017409" 
* commit '30bd3bb77b8bd1ac70723bcf7f1017fc40ea89b2':
  Revert "Debug for bug 18017409"
 2014-11-13 16:50:48 +00:00
Jorim Jaggi
d0d23c80da Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 2014-11-13 16:46:57 +00:00
Craig Mautner
30bd3bb77b Revert "Debug for bug 18017409" 
The bug has been fixed. No longer needed.

This reverts commit 5a3c231dc832c205d2bb2f7f0881925b92c9e5e2.

Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664
 2014-11-13 08:45:39 -08:00
Jorim Jaggi
68b83a784a Fix wrong states when waking up from doze via touch 
Bug: 18337222
Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
 2014-11-13 17:09:29 +01:00
John Spurlock
25c3421c5e Zen: Update condition text for current condition. 
If the provider sends us an updated summary (or other text)
for the currently selected exit condition, update the UI and
persisted condition.

Update the downtime condition text (end time/line2 + summary)
when the next alarm changes (if downtime = none).

Also, clear the fired-alarm cache on time or time-zone resets.

Bug: 16373455
Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
 2014-11-13 11:03:10 -05:00
Alexandra Gherghina
7f39e29504 am c61cabe5: Merge "Update current.txt with the new extra" into lmp-mr1-dev 
* commit 'c61cabe5b3e22c8ebbb0ef91a33c63904ecb9873':
  Update current.txt with the new extra
 2014-11-13 15:36:42 +00:00
Alexandra Gherghina
c61cabe5b3 Merge "Update current.txt with the new extra" into lmp-mr1-dev 2014-11-13 15:31:11 +00:00
Ignacio Solla
f3bd15cf80 am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'bf79cbaba915dbbf419e5f59ca1ab258f64c88b4':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:13:06 +00:00
Alexandra Gherghina
fca2575bff am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit '6e33f0fbb57a8afc2184bd9a1798db8bd29e680a':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-13 15:08:01 +00:00
Geoff Mendal
9bcd95ee7f am f030e66f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'f030e66f9d8b931bf58cb36ae3a0e72c9a487d96':
  Import translations. DO NOT MERGE
 2014-11-13 15:07:56 +00:00
Narayan Kamath
856a0d06a6 am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit 'eed1fba6b54b3305af811b4dd9e367eab01a241b':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:07:51 +00:00
Jeff Brown
4d9bd1516f am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit 'fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff':
  Make Message.setAsynchronous() public.
 2014-11-13 15:07:46 +00:00
Ignacio Solla
bf79cbaba9 Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 2014-11-13 15:03:45 +00:00
Alexandra Gherghina
a73766790a Update current.txt with the new extra 
Bug: 17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
 2014-11-13 14:43:03 +00:00
Alexandra Gherghina
6e33f0fbb5 Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895 Add extra for account migration in the DevicePolicyMamager 
This is in preparation for the implementation CL

Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
 2014-11-13 12:46:16 +00:00
Geoff Mendal
2ebf761ebe Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-13 09:51:10 +00:00
Geoff Mendal
f030e66f9d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-13 09:43:51 +00:00
Narayan Kamath
eed1fba6b5 Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 2014-11-13 09:33:12 +00:00
Geoff Mendal
9976cdbfa3 Import translations. DO NOT MERGE 
Change-Id: I2427bb3c070b9d0d69a2488970a3e74260800190
Auto-generated-cl: translation import
 2014-11-12 23:24:32 -08:00
Geoff Mendal
0df377c7a6 Import translations. DO NOT MERGE 
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
 2014-11-12 23:20:52 -08:00
Jeff Brown
fef1e0e7f0 Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 2014-11-13 07:11:37 +00:00
Renato Mangini
ee291ca2ce am 6f41522d: am c9fc837f: Add new samples to what\'s new page. 
* commit '6f41522d6847afa5bb7ce1cff2a64ec7e9f18ecf':
  Add new samples to what's new page.
 2014-11-13 04:05:00 +00:00
Renato Mangini
6f41522d68 am c9fc837f: Add new samples to what\'s new page. 
* commit 'c9fc837fb3d866484a8ed3e61f2ba551f76af66b':
  Add new samples to what's new page.
 2014-11-13 03:54:11 +00:00
Renato Mangini
c9fc837fb3 Add new samples to what's new page. 
Also reverted the order on the page to show most recent samples first.

Bug: 18323953
Change-Id: I79b01fa71547f4a7d843f52bdd1853dd8fbe54a8
 2014-11-12 18:55:06 -08:00
Andrew Lee
49b03c2374 am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 
* commit '990bbbb3521b44e23087c15f12d4f17ca14630af':
  Add telephony.DisconnectCause for merged IMS call.
 2014-11-13 02:18:38 +00:00