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

168172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yabin Cui
d493fa6d79 am 537888be: Merge "kill HAVE_LOCALTIME_R" 
* commit '537888be7d5cfa6bfa9ddd459a622ea208339735':
  kill HAVE_LOCALTIME_R
 2014-11-13 19:05:06 +00:00
Jean-Michel Trivi
3c922dd7f2 am 84c803f8: am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev 
* commit '84c803f85db1117e1a31e74aa46f9089a3b54cf5':
  Support for delayed audio focus
 2014-11-13 19:03:43 +00:00
Adam Powell
31de5dbe1e am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 
* commit 'e2820ed9636368884b09347ce49658757b696b71':
  Optimize setting padding and backgrounds for views
 2014-11-13 19:03:37 +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
Sander Alewijnse
8c41156178 Add extra to enable device admins to skip removal of system apps. 
Bug:17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
 2014-11-13 18:16:28 +00:00
Jon Eklund
283a9d9e15 AudioRecorder read buffer overflow 
Since function was changed from byte-native to short-native,
it's no longer necessary to multiply offset by sizeof(short).

Bug 18367580

Change-Id: I669d860334ba40e46c04e534d7008b9e2401d8cd
 2014-11-13 10:15:58 -08:00
Yabin Cui
537888be7d Merge "kill HAVE_LOCALTIME_R" 2014-11-13 18:14:12 +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
0f17d95e6f am 9e070715: am f338fcba: Merge "Use the suggested stream if it\'s currently active" into lmp-mr1-dev 
* commit '9e0707155f094e20804c30f18083615530e1fc0d':
  Use the suggested stream if it's currently active
 2014-11-13 18:06:14 +00:00
Mike Lockwood
b8cb45fddf am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 
* commit '0181664081db2149aa465332c33c5cb413a4348c':
  MTP: Update JNI for new packet getters
 2014-11-13 18:01:55 +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
Yabin Cui
25d58a9357 kill HAVE_LOCALTIME_R 
Bug: 18361583
Change-Id: Ia79e2b641fd6c61ae5d2b8f2db5456bd3d36a25b
 2014-11-13 09:57:22 -08: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
Andreas Gampe
f8eac973af am f0044947: Merge "Frameworks/base: New GL bindings" 
* commit 'f0044947a7199278d529c9b0b53cde089851ce23':
  Frameworks/base: New GL bindings
 2014-11-13 17:51:41 +00:00
Andreas Gampe
f0044947a7 Merge "Frameworks/base: New GL bindings" 2014-11-13 17:43:48 +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
922807a39c am c1bb8620: am a77a37c4: Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev 
* commit 'c1bb86200dd995229ec6a3956f21065a8e4a425f':
  Fix doze jank by removing a fullscreen layer of overdraw
 2014-11-13 17:08:51 +00: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
5fbd9950e7 am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 
* commit '76c234c8dfca8203521b022c15a38e041c294589':
  Fix wrong states when waking up from doze via touch
 2014-11-13 16:55:13 +00:00
Craig Mautner
759d34cbd0 am 316e369c: am 30bd3bb7: Revert "Debug for bug 18017409" 
* commit '316e369c4c053125faf9c78d42855f257cfe48a2':
  Revert "Debug for bug 18017409"
 2014-11-13 16:55:07 +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
a28bd7a04b am 7f39e295: am c61cabe5: Merge "Update current.txt with the new extra" into lmp-mr1-dev 
* commit '7f39e29504fe4894d7b26deb35241f3402806952':
  Update current.txt with the new extra
 2014-11-13 15:40:06 +00: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
b993a4c70b am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 
* commit 'f3bd15cf80ecc748fbd232fec31fdf18d06e48a1':
  [WebView] Allow the WebView to be compiled against the system SDK.
 2014-11-13 15:20:29 +00:00
Alexandra Gherghina
a3b4ab2015 am fca2575b: am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 
* commit 'fca2575bffc8bee495cede445849e0183aa9ab51':
  Add extra for account migration in the DevicePolicyMamager
 2014-11-13 15:15:44 +00:00
Geoff Mendal
7a7ac8627b am 9bcd95ee: (-s ours) am f030e66f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9bcd95ee7fb6d9663de483d1d828d71442944098':
  Import translations. DO NOT MERGE
 2014-11-13 15:15:39 +00:00
Narayan Kamath
cb313d1a61 am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit '856a0d06a64b5aebaf2afcc477bfc82308de7c9a':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:15:34 +00:00
Jeff Brown
36ed36a2ea am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit '4d9bd1516f7d495ee16bcfeca95a2ab45e33de4c':
  Make Message.setAsynchronous() public.
 2014-11-13 15:15:28 +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
Geoff Mendal
459309349b am 2ebf761e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2ebf761ebebef65349826e7bd84c667d26e69e51':
  Import translations. DO NOT MERGE
 2014-11-13 15:06:18 +00:00