Commit Graph

239648 Commits

Author SHA1 Message Date
TreeHugger Robot
b020279952 Merge "Added null check in appendSettingToCursor" into nyc-dev 2016-04-13 03:10:23 +00:00
TreeHugger Robot
0dc92ca5a7 Merge "Removed redundant notification title." into nyc-dev 2016-04-13 02:41:05 +00:00
Jorim Jaggi
4196ab00e3 Merge "Fix calculation of content insets" into nyc-dev 2016-04-13 02:40:41 +00:00
Jorim Jaggi
656f6506fb Fix calculation of content insets
When calculating all the frames and insets, we need to use the actual
frame instead of layoutContainingFrame. To do this, we layout mFrame
with layoutContaining/layoutDisplayFrame, calculate all the content
frames and insets, and then offset everything by the constant offset.

Bug: 28075359
Change-Id: I78f0a54ca2a0cc6c7c8be21153c2b2c8f1d5c0a9
2016-04-12 19:35:24 -07:00
Jorim Jaggi
f0ad384e9e Merge "No input for windows in minimized docked stack" into nyc-dev 2016-04-13 02:31:49 +00:00
Lorenzo Colitti
3395ed1421 Merge "If we want to release the lock, release instead of acquiring it." into nyc-dev 2016-04-13 02:30:33 +00:00
Jorim Jaggi
b72c9ad721 No input for windows in minimized docked stack
Also make them unfocusable, and don't focus the docked
stack when tapping into it in that state.

Bug: 27972642
Change-Id: Ic24ff9a5f39f596fe4a2f50567566d4400f9c125
2016-04-12 19:29:28 -07:00
Jorim Jaggi
a5df489c9c Merge "Add shadow for minimized dock" into nyc-dev 2016-04-13 02:24:57 +00:00
Jorim Jaggi
2917dc4918 Add shadow for minimized dock
Bug: 27972642
Change-Id: Ic4c8145f61694ff2bb0e237da1142093c6a4d965
2016-04-12 19:17:24 -07:00
Roozbeh Pournader
a51a12cfe7 Merge "Add many more emoji tests" into nyc-dev 2016-04-13 02:01:19 +00:00
TreeHugger Robot
c8fc35a9b8 Merge "Trigger enabling of NDO when startProvisioning() is called." into nyc-dev 2016-04-13 01:54:11 +00:00
Suprabh Shukla
c9d064a380 Added null check in appendSettingToCursor
Added check for null setting before adding to MatrixCursor.

Bug: b/27908871
Change-Id: I0b71c3d5347cad705b8def98fda7e9e463c295e2
2016-04-12 18:45:41 -07:00
Paul Jensen
3e6a6fc60e Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 2016-04-13 01:33:37 +00:00
Winson Chung
608f65b144 Merge "Fixing issue with larger clip bounds being specified than in the view." into nyc-dev 2016-04-13 01:29:06 +00:00
Svetoslav Ganov
be43d08ca9 Merge "Fix a regression in magnification center x,y" into nyc-dev 2016-04-13 01:05:47 +00:00
Svetoslav Ganov
0a59531581 Fix a regression in magnification center x,y
bug:28133561

Change-Id: If37baa5f2ebe5840b50ca845bf81ce70cedf0412
2016-04-12 18:02:54 -07:00
Shishir Agrawal
c375dd43af Merge "Fixing few TelephonyManager calls to work when there is no SIM." into nyc-dev 2016-04-13 00:59:10 +00:00
Julia Reynolds
5961ab3ac5 Merge "Remove category from managedservices." into nyc-dev 2016-04-13 00:57:52 +00:00
TreeHugger Robot
2376f9d35f Merge "Don't count system partition code against size." into nyc-dev 2016-04-13 00:54:58 +00:00
TreeHugger Robot
4ecc0ce387 Merge "Fix broken actions with MessagingStyle" into nyc-dev 2016-04-13 00:54:32 +00:00
Dongwon Kang
4c3dcc0a16 Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev 2016-04-13 00:36:35 +00:00
Felipe Leme
a43d139359 Removed redundant notification title.
When a bugreport is finished with a pending notification, it already
display a subtext explaining the situation - not only the extra title is
redundant, but it's too large.

BUG: 27583025
Change-Id: I8d8171faf7b8b86b34f6d860555839918be10550
2016-04-12 17:28:06 -07:00
Andy Hung
03abaa5df9 Merge "Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp" into nyc-dev 2016-04-13 00:26:45 +00:00
TreeHugger Robot
d1b8d6d342 Merge "Set label for links to resolver activities." into nyc-dev 2016-04-13 00:12:39 +00:00
Eino-Ville Talvala
777c4e7644 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 2016-04-13 00:08:09 +00:00
Dongwon Kang
e9db0e1ed1 TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()
Bug: 28078300
Change-Id: I0546c80b50475b1f05d5c5229f6d3796c7372b60
2016-04-12 16:44:40 -07:00
Jack Yu
3a2bce6e51 Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev 2016-04-12 23:43:22 +00:00
Winson
c406f52446 Fixing issue with larger clip bounds being specified than in the view.
Bug: 28145358
Change-Id: Ic3e1042ace6bde9bfe0c647e038d484fd4a05d9b
2016-04-12 16:41:02 -07:00
Siyamed Sinir
2519996e4e Merge "Cache Typeface.createFromAsset objects." into nyc-dev 2016-04-12 23:38:23 +00:00
Jeff Sharkey
cadfc77d03 Merge "Fix broken javadoc." into nyc-dev 2016-04-12 23:37:38 +00:00
Yang Ni
0f10f043be Merge "Destroy Type created by Allocation.createSized()" into nyc-dev 2016-04-12 23:37:01 +00:00
Lifu Tang
d7e1d429c4 Merge "Removed all the references to deprecated class" into nyc-dev 2016-04-12 23:07:58 +00:00
Steve McKay
1db228a74b Merge "Daeal with null cursors more leniently." into nyc-dev 2016-04-12 23:05:27 +00:00
Philip P. Moltmann
f8173ca8ac Set label for links to resolver activities.
Also: Add specific labels for capture-image-intent.

Fixes: 20134921
Change-Id: I3678def1089512a8340f19110645a03379c26cee
2016-04-12 15:44:00 -07:00
Sid Soundararajan
15986f0900 Merge "Have Recents focus second task when launched, if 2 or more tasks are available" into nyc-dev 2016-04-12 22:43:49 +00:00
Makoto Onuki
1d616f0d88 Merge "ShortcutManager: Address API review feedback." into nyc-dev 2016-04-12 22:34:17 +00:00
Jeff Sharkey
959586b9a9 Don't count system partition code against size.
Bug: 28136734
Change-Id: I2b843b13c493bbf78c2ad9dd7d75faa302e3a11b
2016-04-12 16:28:57 -06:00
Yang Ni
e1798e4284 Destroy Type created by Allocation.createSized()
Bug: 27972184
Change-Id: I4f80c74079087eab20b75a701c56cde141322462
(cherry picked from commit 3444dbe025)
2016-04-12 15:11:31 -07:00
Svetoslav Ganov
65136ac6a4 Merge "Keep read/write external storage as built-in permissions" into nyc-dev 2016-04-12 22:11:19 +00:00
John Reck
7239d957e9 Merge "Fix reset() to zero slowFrameCounts" into nyc-dev 2016-04-12 22:03:31 +00:00
Andy Hung
4c01520470 Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp
Bug: 27952053
Change-Id: I2940de5ef1a67ec9a2ad8e294149243679f7324a
2016-04-12 15:01:31 -07:00
Adrian Roos
48d746ab32 Fix broken actions with MessagingStyle
Bug: 27250207
Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11
2016-04-12 15:00:31 -07:00
Eino-Ville Talvala
fa5e2a156d Camera/Surface: Update OutputConfiguration API
- Rename "surface set ID" to "surface group ID"
- Remove setSurfaceSetId
- Use constructor overloads to set surface group ID, make
  OutputConfiguration immutable
- Add Surface.getConsumerDescriptor to make it possible to verify
  if two Surfaces have the same backing consumer
- Cache initial surface generation ID in OutputConfiguration so that
  changes in a Surface's internals will label it is as a
  new output
- Add sample use case for surface group IDs

Bug: 27950763
Bug: 28076469
Change-Id: I13251d1dd3d26a978ffbedc519966524e93bc61c
2016-04-12 14:51:17 -07:00
TreeHugger Robot
5dc3c674a2 Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev 2016-04-12 21:38:10 +00:00
TreeHugger Robot
d92e5c314e Merge "Add implemention for isSameTrustConfiguration" into nyc-dev 2016-04-12 21:28:52 +00:00
Jeff Sharkey
f82c2f0854 Fix broken javadoc.
Change-Id: I9f2050fd6040234bb1d759ab346f79fc41247aa9
2016-04-12 15:22:57 -06:00
Alan Viverette
20f2b38ea4 Merge "Include current selection mode in TimePicker event text" into nyc-dev 2016-04-12 21:18:15 +00:00
Andreas Gampe
1ef8aef260 Frameworks/base: Add no-thread marking to zygote
Use ZygoteHooks code to mark zygote initialization to not be
allowed to create threads. This is helpful when new classes are
found to be used by apps but cannot be preloaded as they spawn
threads.

Bug: 27248115
Change-Id: I1dc3620d9e7d0054c672b993d89459fc4b353dfc
2016-04-12 21:04:35 +00:00
Andreas Gampe
d581ce373c Merge "Frameworks/base: Update preloaded-classes" into nyc-dev 2016-04-12 21:02:31 +00:00
Lifu Tang
5b49d8a006 Removed all the references to deprecated class
Bug: 28144767
Change-Id: If14752a81f6662fb33aacc04d54bfee249221d74
2016-04-12 14:00:14 -07:00