151811 Commits

Author SHA1 Message Date
Edward Jee
d796159bbb am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev
* commit 'c172b2090317b158974bc73d8baa141449a1d784':
  Adds APIs for Bluetooth PBAP and MAP access permission.
2014-09-16 08:44:13 +00:00
Igor Murashkin
110a880342 am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev
* commit '6d2cca330f2bfd7e9fc4699f3e8248762454e344':
  camera2-legacy: Fix jpeg thumbnail quality not being set
2014-09-16 08:44:09 +00:00
Adam Lesinski
3d52cb5da2 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:44:06 +00:00
Eino-Ville Talvala
f0a9713e18 am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev
* commit '3703cae1eec5128f0f93ca873a06ca41e99b1805':
  Camera2: Check for sequence complete sooner.
2014-09-16 08:44:02 +00:00
Alan Viverette
8f9fc07aa0 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:43:58 +00:00
Alan Viverette
fa79bfd280 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:43:54 +00:00
Yohei Yukawa
ce0a930be2 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:43:51 +00:00
Ang Li
909c459169 am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev
* commit '36fdf64f0305db556a448efae1b9f0241a3b5ee0':
  Fix a typo in comment.
2014-09-16 08:43:47 +00:00
Adam Powell
7920c579dc 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:43:43 +00:00
ztenghui
06f18924fd 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:43:39 +00:00
Adam Powell
3b1a9b3f69 am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev
* commit '17ec7920bab6cbec4be42f4f0db8c8e6cc2f484e':
  Finish materializing dialogs
2014-09-16 08:43:35 +00:00
Jeff Tinker
e6a4e3be06 am 2596d6de: Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev
* commit '2596d6de7ecb3caf8c06eeda2f1b3485e92714b0':
  Document retry behavior for MediaCodec.CryptoException
2014-09-16 08:43:32 +00:00
Jeff Sharkey
f38c7ad042 am 6abc3ef8: Merge "Whoops, wait around for pm result." into lmp-dev
* commit '6abc3ef8382b4cd6ca0049554bff4345de05315d':
  Whoops, wait around for pm result.
2014-09-16 08:43:28 +00:00
Yorke Lee
55fd1a01ad 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:43:24 +00:00
Chet Haase
4aec3867fe 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:43:20 +00: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
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
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
Shri Borde
7ac5d6fccd Merge "Unhide android.provider.Telephony.Sms.SUB_ID" into lmp-sprout-dev 2014-09-15 23:14:49 +00: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
Yorke Lee
f13a8b797d No longer require READ_PHONE_STATE permission for getCallState
Bug: 17510808
Change-Id: Id3bb5bf2fea9489bd613063aa946389e8ceb3104
2014-09-15 15:46:57 -07:00
Chet Haase
18c56d0ac4 Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 2014-09-15 22:40:04 +00:00
Chet Haase
27652eff44 Avoid invalidating view during some outline invalidations
We were invalidating the view during outline invalidation far
too often. Sometimes, it's appropriate to invalidate the view when
the outline changes, but not when the outline is being invalidated
in the middle of drawing the view, which is done in reaction to a view
invalidation.

Issue #17460940 Volantis: panning in Calendar from month to month is only at 30fps

Change-Id: I7bdee17dc9c7df89d4cd3d781010823cef931222
2014-09-15 15:33:10 -07:00
Ang Li
953b5625d5 Fix a typo in comment.
Change-Id: I23224b1adf946ebec0ec7a39686913189c9b8287
2014-09-15 15:09:16 -07:00
Jeff Sharkey
2d360218b4 am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev
* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d':
  Update API naming to follow style guide.
2014-09-15 22:01:59 +00:00
Michael Wright
b5d856a85e am b46fd00a: Merge "Add config option for permanent dpad presence." into lmp-dev
* commit 'b46fd00aa1bd2a36755494c4e375bb8d6d967ceb':
  Add config option for permanent dpad presence.
2014-09-15 22:01:55 +00:00
Chris Craik
aca8b5fd6b am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev
* commit '447f8cd8e5b71119eaee3d6b9b319caeacd9e5cb':
  Enable shadow for GhostView
2014-09-15 22:01:51 +00:00
Svet Ganov
654f9279cc am f7d0cd92: Merge "Fix a crash in pring spooler." into lmp-dev
* commit 'f7d0cd92c6a049a54efc2e29ec69c34f096be46d':
  Fix a crash in pring spooler.
2014-09-15 22:01:47 +00:00
Ihab Awad
e11a3b798b am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev
* commit '336c84c35722e221cb3ec5d99c3876a5e5015e2a':
  Add system feature for ConnectionService API support (1/3)
2014-09-15 22:01:41 +00:00
John Spurlock
5e699ca6a1 am f2dc7e56: Merge "Doze: Aggressively dial down notification-related pulses." into lmp-dev
* commit 'f2dc7e56235631542d9f0ddc042832391da3453f':
  Doze: Aggressively dial down notification-related pulses.
2014-09-15 22:01:37 +00:00
Jeff Sharkey
49c0e7375b Merge "Update API naming to follow style guide." into lmp-dev 2014-09-15 21:51:18 +00:00
Jeff Sharkey
5ab6e0bac2 Whoops, wait around for pm result.
poll() returns immediately; we want to take() to wait for the result
to actually arrive.

Bug: 17510699
Change-Id: I87669e79e9941480fed33e4cc8a38de793d59e90
2014-09-15 14:50:41 -07:00
Michael Wright
63d991f28c Merge "Add config option for permanent dpad presence." into lmp-dev 2014-09-15 21:38:40 +00:00
Chris Craik
7436d1997c Merge "Enable shadow for GhostView" into lmp-dev 2014-09-15 21:32:06 +00:00