153575 Commits

Author SHA1 Message Date
Adam Lesinski
006d1bc4ed am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev
* commit '1416621b4407fe8a1b488cface2be5743fa4b7a3':
  Show the lockscreen when more than 1 user is present
2014-09-16 08:42:12 +00:00
Eino-Ville Talvala
667a73f860 am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev
* commit '3703cae1eec5128f0f93ca873a06ca41e99b1805':
  Camera2: Check for sequence complete sooner.
2014-09-16 08:42:07 +00:00
Alan Viverette
c6d995ddf9 am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev
* commit '1375db7006e58635912a2fafce1ede47ed10bac0':
  Always apply ImageView's tint attribute using SRC_ATOP by default
2014-09-16 08:42:02 +00:00
Alan Viverette
8835fae34b am 6a750aa9: Merge "Reduce overdraw after clearing ripples in RippleDrawable" into lmp-dev
* commit '6a750aa989acff176e7b59abc17fa07ae6498709':
  Reduce overdraw after clearing ripples in RippleDrawable
2014-09-16 08:41:58 +00:00
Yohei Yukawa
b130f0a876 am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev
* commit '8219934a5569b14a3bc9223bc33164e2fe05c044':
  Minimize the number of default enabled IMEs part 3
2014-09-16 08:41:52 +00:00
Ang Li
2fbb4e6391 am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev
* commit '36fdf64f0305db556a448efae1b9f0241a3b5ee0':
  Fix a typo in comment.
2014-09-16 08:41:47 +00:00
Adam Powell
ab71fea9a1 am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev
* commit '3b2dfa7a301d8e45b3e6f3c99f95b7ba27bb3bf2':
  Treat empty string as title-set in ToolbarWidgetWrapper
2014-09-16 08:41:41 +00:00
ztenghui
cfba03b27a am 3137b288: Merge "Set cache dirty when re-create the cache bitmap" into lmp-dev
* commit '3137b2889acb5c7c9ee8e3fe9a03cbf0347d223d':
  Set cache dirty when re-create the cache bitmap
2014-09-16 08:41:36 +00:00
Adam Powell
fa00c2533e am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev
* commit '17ec7920bab6cbec4be42f4f0db8c8e6cc2f484e':
  Finish materializing dialogs
2014-09-16 08:41:30 +00:00
Jeff Tinker
971b0d471c am 2596d6de: Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev
* commit '2596d6de7ecb3caf8c06eeda2f1b3485e92714b0':
  Document retry behavior for MediaCodec.CryptoException
2014-09-16 08:41:25 +00:00
Jeff Sharkey
3d516aaaf1 am 6abc3ef8: Merge "Whoops, wait around for pm result." into lmp-dev
* commit '6abc3ef8382b4cd6ca0049554bff4345de05315d':
  Whoops, wait around for pm result.
2014-09-16 08:41:20 +00:00
Yorke Lee
1d4160abfe am 4d4f62ba: Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev
* commit '4d4f62ba2261fc230156c69859c6655e59a79fc4':
  No longer require READ_PHONE_STATE permission for getCallState
2014-09-16 08:41:14 +00:00
Chet Haase
43ef3c0f6c am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev
* commit '4b20b03109947531f934bbeed819f522cf8f43b8':
  Avoid invalidating view during some outline invalidations
2014-09-16 08:41:08 +00:00
Yuncheol Heo
41f766394d Merge "Make the playback device pass CEC CTS." into lmp-dev 2014-09-16 07:41:24 +00:00
Yuncheol Heo
89ec14e48f Make the playback device pass CEC CTS.
- Clear the logical address on the hotplug event.
- Don't reset mIsActiveSource flag on the hotplug event.

Bug: 17517438
Change-Id: Id129a9cce30323090ce21bbfc188b955bd32755b
2014-09-16 15:53:59 +09:00
Svetoslav
e3cdd4dc6c Merge "Missing or wrong pages in preview when scorlling large docs." into lmp-dev 2014-09-16 06:19:59 +00:00
Svetoslav
f3f963b0be Missing or wrong pages in preview when scorlling large docs.
The bound pages in the adapter were not properly tracked, more
specifically we did not remove pages from the bound set ending
up in a bad state. Also when the printer changes and if the
new one has different page size the content disappears due to
us not notifying for the data set change.

bug:17515670

Change-Id: Iac74e864609012f6804584fa133e87c27dc186a5
2014-09-15 21:07:27 -07:00
Tsuwei Chen
dc524b714e Merge "Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7" into lmp-dev 2014-09-16 03:50:02 +00:00
Alan Viverette
d015e3454e Properly handle dispatchRestoreInstanceState for new-style DatePicker
Fixes reversed day/month/year in restore instance state.

BUG: 17514055
Change-Id: Id839f2f0dbca47034dc84100dbeb1c32e8848178
2014-09-15 19:27:55 -07:00
Svetoslav
56bdeeeb80 Merge "Page shredder callback invoked on the wrong thread." into lmp-dev 2014-09-16 02:22:22 +00:00
Svetoslav
0e51a6d97a Merge "Update print preview when a printer becomes available" into lmp-dev 2014-09-16 02:21:59 +00:00
Yorke Lee
a0d3ca9746 Add missing methods to Conference object
Add setAudioState, onPlayDtmf and onStopDtmf to the conference object.
This fixes DTMF tones for conference calls.

Bug: 17512380
Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
2014-09-15 19:18:13 -07:00
Svetoslav
fb3532eea3 Page shredder callback invoked on the wrong thread.
The code executed in the shredder completion callback must
be called on the main thread but instead it was called on
another one. This led to a crash.

bug:17514533

Change-Id: Id9e86d38a90fedadc60f967b193470fd83eb3362
2014-09-15 19:01:34 -07:00
Alan Viverette
d735c9b1ed Fix TimePicker.setCurrentHour() when argument is 0
BUG: 17515453
Change-Id: Ie67db01ed3c574a23ec377de15e48aa1b4ae3709
2014-09-15 18:54:10 -07:00
Jungshik Jang
962683fddd Merge "Fix volume change failure in HDMI-CEC system audio mode." into lmp-dev 2014-09-16 01:52:30 +00:00
Dianne Hackborn
602d17c353 Merge "Quick fix issue #17514851: dumpsys package <package-name> includes..." into lmp-dev 2014-09-16 01:34:24 +00:00
Svetoslav
e0fa06c088 Update print preview when a printer becomes available
We laizily request printer capabilities and when they are reported
we were not updating the preview and as a result the content was not
rendered, hence pages showing an empty state.

bug:17514117

Change-Id: Icfee7eaa1ab63f5e4d7655d4057ef2110c27cd43
2014-09-15 18:21:14 -07:00
Edward Jee
1bbfcc2fdc Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 2014-09-16 01:19:19 +00:00
Jungshik Jang
c9ff968787 Fix volume change failure in HDMI-CEC system audio mode.
In order to get volume change event, output device should not be
in fixed volume device. This change ignores CEC releated outputs
if system audio mode is on.

Along with this, fix invalid output from getStreamForDevice
as AudioPolicManager does.

Bug: 17502272
Change-Id: I7d4406caea7fa6617f17969dc61aabebb87ecf7d
2014-09-16 10:12:41 +09:00
Igor Murashkin
4e5eddff5e Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 2014-09-16 00:58:24 +00:00
Igor Murashkin
89bb63f395 camera2-legacy: Fix jpeg thumbnail quality not being set
Bug: 17472049
Change-Id: I6ce9f2bb07def86bc58b4b2495c58ee6762a65e1
2014-09-15 17:54:09 -07:00
Adam Lesinski
3846c1d261 Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 2014-09-16 00:50:23 +00:00
Eino-Ville Talvala
d701bfb615 Merge "Camera2: Check for sequence complete sooner." into lmp-dev 2014-09-16 00:47:29 +00:00
Adam Lesinski
61d9409239 Show the lockscreen when more than 1 user is present
Bug:17399024
Change-Id: Iaf2ea2747cbcd9db45ba9faa7c8fe0389a799855
2014-09-15 17:46:10 -07:00
Alan Viverette
7413501b9c Merge "Always apply ImageView's tint attribute using SRC_ATOP by default" into lmp-dev 2014-09-16 00:40:36 +00:00
Alan Viverette
238aeca552 Merge "Reduce overdraw after clearing ripples in RippleDrawable" into lmp-dev 2014-09-16 00:37:16 +00:00
Yohei Yukawa
84f20ec49d Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 2014-09-16 00:19:55 +00:00
Ang Li
85be272268 Merge "Fix a typo in comment." into lmp-dev 2014-09-16 00:00:37 +00:00
Adam Powell
afd3a3a049 Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 2014-09-15 23:55:34 +00:00
ztenghui
6b5db58f10 Merge "Set cache dirty when re-create the cache bitmap" into lmp-dev 2014-09-15 23:46:04 +00:00
Adam Powell
ebff4063ba Merge "Finish materializing dialogs" into lmp-dev 2014-09-15 23:41:57 +00:00
ztenghui
9c13ed366f Set cache dirty when re-create the cache bitmap
b/17503595

Change-Id: Icdaa3651345b740772363f8afb29bb36741fcc87
2014-09-15 23:41:34 +00:00
Dianne Hackborn
f1317857cd Quick fix issue #17514851: dumpsys package <package-name> includes...
...irrelevant install state at the end

Quick and dirty impl just doesn't print any of that data when filtering
by package name.  In the future that part of the dump should be smarter
to know how to filter by package name.  (Probably also moved to a place
earlier in the dump, so the key information -- the overall package
data -- is still at the end.)

Change-Id: I094f7c2f25401438a68a6aa00d10b19c19eb7c7d
2014-09-15 16:40:07 -07:00
Jeff Tinker
a526ba1217 Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev 2014-09-15 23:37:08 +00:00
Adam Powell
6192b07bdc Treat empty string as title-set in ToolbarWidgetWrapper
If a developer explicitly sets the empty string as the title of a
Toolbar that is used as an action bar via Activity#setActionBar, don't
overwrite it with the window title. This clears up a nonintuitive
behavior when explicitly clearing the title of a toolbar.

Bug 17510951

Change-Id: I183c2ca57d3bd16ae1f89bb7daa2cdf086189138
2014-09-15 16:36:01 -07:00
Eino-Ville Talvala
848fe733f3 Camera2: Check for sequence complete sooner.
It's possible, especially with legacy mode, for a last frame for a
sequence to have already arrived when a repeating sequence is stopped.

In that case, need to check for sequence complete as soon as the
requestId, framenumber pair is added to the pending queue of completions.

Bug: 17428716
Change-Id: Ie5c6ea5a43639c812b8441da326c6303e150fce0
2014-09-15 16:28:02 -07:00
Alan Viverette
38f93bcb21 Always apply ImageView's tint attribute using SRC_ATOP by default
Preserves pre-L behavior and avoids requiring developers to manually
set the tintMode to SRC_ATOP when targeting SDK 21+.

BUG: 17507827
Change-Id: I43f86cbcb9662172254f46700441ca85a54428f6
2014-09-15 16:25:09 -07:00
Dianne Hackborn
95465200b0 Fix issue #17507017: took ~3 seconds to move an app to the foreground
This is because of the 5 second timeout from when the user can bring
home to the foreground until regular third party apps can launch an
activity on top of it.  Activities launched from notifications look
like they are being launched by the app, so get impacted by the timeout.

Fix this be also looking at the actual caller to see if they are
allowed to pop in front regardless of the timeout.

Change-Id: I63fbc2bcabf585e6d2810a2309f0613fdf91fdf5
2014-09-15 16:21:55 -07:00
Jeff Sharkey
8246e815ac Merge "Whoops, wait around for pm result." into lmp-dev 2014-09-15 22:55:53 +00:00
Yorke Lee
6b19a00d70 Merge "No longer require READ_PHONE_STATE permission for getCallState" into lmp-dev 2014-09-15 22:50:36 +00:00