Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,021 Commits 3 Branches 0 Tags
cdd400aee194651fce88d382ccc4a2633daeef1d
Commit Graph

39819 Commits

Author SHA1 Message Date
Jeff Sharkey
cdd400aee1 am b81b5176: am eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into lmp-dev 
* commit 'b81b51760e627eec388d2bbf9c27c6e8c46e28de':
  Guard against EOF when reading in FileBridge.
 2014-08-22 02:59:21 +00:00
Eino-Ville Talvala
5705c8f5f2 am 9c324750: am 4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 
* commit '9c324750a37db67d00724056942cfe221ad6521f':
  Camera2: Fix return type of CaptureFailure#getFrameNumber
 2014-08-22 01:05:03 +00:00
Jeff Sharkey
8e28c9c315 Merge "Guard against EOF when reading in FileBridge." into lmp-dev 2014-08-22 00:58:02 +00:00
Jeff Sharkey
5f1ed727e2 Guard against EOF when reading in FileBridge. 
Bug: 17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322
 2014-08-21 17:54:29 -07:00
Eino-Ville Talvala
2d9a18e02e Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 2014-08-22 00:46:41 +00:00
Yin-Chia Yeh
c33f32db54 am 173871c9: am 671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev 
* commit '173871c9cecf3a72907e73a214523a93a8b0d82c':
  Camera2: add toString for two params classes
 2014-08-22 00:38:04 +00:00
Yin-Chia Yeh
6fc6748ffb Merge "Camera2: add toString for two params classes" into lmp-dev 2014-08-22 00:20:06 +00:00
George Mount
15da35abec am 7f09ecc5: am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit '7f09ecc574a079a6c0b2b7010f78caf61b1ced05':
  Add Parent Change to ChangeTransform
 2014-08-21 23:19:23 +00:00
George Mount
99db6030e1 Merge "Add Parent Change to ChangeTransform" into lmp-dev 2014-08-21 23:00:05 +00:00
Dake Gu
c94e2b393f Add Parent Change to ChangeTransform 
Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
 2014-08-21 15:50:17 -07:00
Igor Murashkin
996020efa9 am f66338c2: am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit 'f66338c214b4f74467b3600a3fa3a5254fd9319d':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:45:59 +00:00
George Mount
cd965c6dcf am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'ef21ecd5701dec9d7f40036b51bff42528075304':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:45:55 +00:00
Igor Murashkin
b68654ce84 Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 2014-08-21 22:33:29 +00:00
George Mount
7762e8e798 Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 2014-08-21 22:26:57 +00:00
George Mount
b89d5cc2c6 Allow Activities to opt into using Overlay for shared elements. 
Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
 2014-08-21 14:30:51 -07:00
Eino-Ville Talvala
edecaee1f2 Camera2: Fix return type of CaptureFailure#getFrameNumber 
Should be long, not int.

Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29
 2014-08-21 14:28:50 -07:00
Adam Lesinski
53fc386d5c am b797a064: am 435afbc5: Merge "Report the right resource version in am get-config" into lmp-dev 
* commit 'b797a06449db4019b0c1c6ca8fd4b385770c162c':
  Report the right resource version in am get-config
 2014-08-21 20:49:33 +00:00
Matthew Williams
50892518ed am 47d59fb7: am 7a67b0c9: JobScheduler needs to flush queue on charging 
* commit '47d59fb79d29d590f43be9e26d3cc196cc4aa14f':
  JobScheduler needs to flush queue on charging
 2014-08-21 20:49:27 +00:00
John Reck
ee2073d41f am 3da1fa50: am 25f606a0: Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 
* commit '3da1fa506599e1d6fb70937277ce29243f083137':
  Fix supporting modifying listeners in callbacks
 2014-08-21 20:40:54 +00:00
Adam Lesinski
b5136731b2 Merge "Report the right resource version in am get-config" into lmp-dev 2014-08-21 20:39:00 +00:00
Matthew Williams
bafeeb9813 JobScheduler needs to flush queue on charging 
Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72
 2014-08-21 20:37:06 +00:00
Alan Viverette
29c2bca3c5 am a6fbf40e: am 52e313c1: Merge "Jump drawable state (including ripples) on view detach" into lmp-dev 
* commit 'a6fbf40e60135d83abcdeed031d8e3df8e8444ef':
  Jump drawable state (including ripples) on view detach
 2014-08-21 20:32:10 +00:00
John Reck
2b5d920e80 Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 2014-08-21 20:18:56 +00:00
Alan Viverette
04e723c1af Merge "Jump drawable state (including ripples) on view detach" into lmp-dev 2014-08-21 20:03:03 +00:00
Alan Viverette
d78a44576c Jump drawable state (including ripples) on view detach 
BUG: 15350931
Change-Id: I09928f59fb7b9f6d87b1f5219353a41ae6b5681d
 2014-08-21 12:57:45 -07:00
John Reck
3b27e59e1e Fix supporting modifying listeners in callbacks 
Bug: 17179442

Change-Id: I2d64f86395c0b1befb5c10b9c696330db1c96821
 2014-08-21 12:37:48 -07:00
Adam Lesinski
ebc3e4cbf1 Report the right resource version in am get-config 
Change-Id: I79ed3db45d91d8ec7e6f67608533ce3adf22ab27
 2014-08-21 12:21:45 -07:00
Andre Eisenbach
e50aa22d6f am bf22072d: am e2f5c5c4: Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 
* commit 'bf22072dd6a3bdfabd3be288b2c1b99eea8a9e64':
  LE: Rename new MTU and connection paramter update APIs
 2014-08-21 18:19:12 +00:00
Andre Eisenbach
491cb3f578 Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 2014-08-21 17:56:25 +00:00
Andres Morales
d3a520b4cc am ea5ffd04: am 87eeebec: Merge "Remove old NFC unlock api" into lmp-dev 
* commit 'ea5ffd047f340224e4a8df97fc24f2d907b8ee46':
  Remove old NFC unlock api
 2014-08-21 17:27:31 +00:00
Dianne Hackborn
865bac56f5 am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit 'a7d4d7bcfa51aa6d556652141a34c497bb4132d0':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:17:24 +00:00
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Chris Craik
b1e59e8563 am 6ec6fe3a: am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '6ec6fe3ac2b003208e82848725896866a0945bcf':
  Clarify text shadow attribute/method comments
 2014-08-21 17:04:44 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Nicolas Prevot
b4c43c029e am 6815c529: am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '6815c5298b8b8658cec7eecb43117d7abfe4dd71':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:47:13 +00:00
Chris Craik
c56a1a51a9 Merge "Clarify text shadow attribute/method comments" into lmp-dev 2014-08-21 16:46:53 +00:00
Nicolas Prevot
01e6a6fef1 Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 2014-08-21 16:33:47 +00:00
Zhijun He
d38b381086 am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit '8fece5d08a5ee0409a28f383a52ebc7dbfe8afda':
  Camera2: update aberration correction related tag name
 2014-08-21 16:33:43 +00:00
Jaewan Kim
5eaae72f72 am 48f09811: am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit '48f098115b6654ce8da754ff11b40965308f44d5':
  TIF: Accept any character for custom label.
 2014-08-21 16:33:38 +00:00
Nicolas Prevot
465acf3f3f Marking the methods to get Profile/Device Owner with @SystemApi. 
BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
 2014-08-21 17:22:28 +01:00
Kenny Guy
80ab66574a am 676fedb0: am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '676fedb03498436cf6551ea9e0ae5486e7fe9e0c':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:20:24 +00:00
Esteban Talavera
29c6dfe446 am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '4536f11f64b6fa2d99f65424819f20401d2c0830':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:20:19 +00:00
Esteban Talavera
de7706999e am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'ff3bcbf8134faf2dfddf26bf00afd90c462e9699':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:20:15 +00:00
Jorim Jaggi
7ff086fdff am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'fa4b90b870980baa42ff868d2d331effae70956d':
  Update notification layouts to match redlines
 2014-08-21 16:20:09 +00:00
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Jaewan Kim
edaece1f30 Merge "TIF: Accept any character for custom label." into lmp-dev 2014-08-21 16:13:25 +00:00
Jaewan Kim
f0e530e4eb TIF: Accept any character for custom label. 
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
 2014-08-22 01:05:40 +09:00
Kenny Guy
7a13ea7e3b Merge "Replicate text and sounds settings for managed profile." into lmp-dev 2014-08-21 15:55:43 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Yin-Chia Yeh
97376d90d6 Camera2: add toString for two params classes 
Add toString for RggbChannelVector and ColorSpaceTransform.
Also change ColorSpaceTransform equals implementation to actually
compare the underlying rationals.

bug 16963063

Change-Id: I858153b405bc3541959be79962db750d429413a3
 2014-08-21 08:28:17 -07:00