Derek Sollenberger
c190813b93
Expose SkiaCanvas header file.
...
Previously the header for SkiaCanvas was contained in the .cpp file,
but in prepration for broader use of SkiaCanvas we are moving the
header into its own .h file.
Change-Id: Ib8c738366198a9b63e7429d51e9fa5aec106fdb1
2016-07-19 16:36:45 -04:00
Derek Sollenberger
163c97a8ea
Merge changes from topic 'skia_merge'
...
* changes:
Fix include to match Skia filename change
Remove references to SkImageDecoder (part 2)
Update SkiaCanvasProxy with SkSurface API change
Return DNG mimeType for the case kDNG_SkEncodedFormat
Remove use of SkFixed. Update code to use SkGlyph.fAdvance[XY] after https://codereview.chromium.org/1737693006 .
skia SkDocument - new MakePDF API, fix leak
2016-07-18 12:07:44 +00:00
Andrei Stingaceanu
4e750e822f
Merge "Keyboard shortcuts: minor Activity broadcast refactor"
2016-07-18 09:39:52 +00:00
Abodunrinwa Toki
cc59a84490
Merge \\"FloatingActionMode: Fix screen coordinates.\\" into nyc-mr1-dev am: 3b8e0fdf92
...
am: c749762107
2016-07-17 18:26:40 +00:00
Abodunrinwa Toki
c749762107
Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev
...
am: 3b8e0fdf92
2016-07-17 18:20:11 +00:00
Abodunrinwa Toki
3b8e0fdf92
Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev
2016-07-17 18:07:09 +00:00
Tim Murray
36030dda49
Merge \\"Make sure StrictMode allows disk reads when calling isThreadInProcess.\\" into nyc-mr1-dev am: afa67f3d34
...
am: 62547293e3
2016-07-16 19:29:44 +00:00
Tim Murray
62547293e3
Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev
...
am: afa67f3d34
2016-07-16 19:25:37 +00:00
Tim Murray
afa67f3d34
Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev
2016-07-16 19:14:30 +00:00
Tim Murray
9bc12a83b6
Make sure StrictMode allows disk reads when calling isThreadInProcess.
...
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.
bug 30170339
Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
2016-07-16 11:48:01 -07:00
Adam Lesinski
8024bf723c
Merge \\"Deprecate Resources constructor and updateConfiguration() method\\" into nyc-mr1-dev am: c3829f528e
...
am: 6a9f651b73
2016-07-16 02:44:06 +00:00
Andreas Gampe
80c3459b3f
Frameworks/base: Fix braino missing line am: 06eb24d95e
...
am: 46d5eca989
2016-07-16 02:43:56 +00:00
Adam Lesinski
6a9f651b73
Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev
...
am: c3829f528e
2016-07-16 02:38:24 +00:00
Andreas Gampe
46d5eca989
Frameworks/base: Fix braino missing line
...
am: 06eb24d95e
2016-07-16 02:38:18 +00:00
TreeHugger Robot
c3829f528e
Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev
2016-07-16 02:33:55 +00:00
Robert Shih
6f5be322d2
MediaRecorder: fix OnInfo related documentation
...
The original documentation said MediaRecorder.OnInfoListener was called for
error cases.
Bug: 25424209
Change-Id: Ic8d2dee67b15a64604a959e7e6964436da92d6ba
2016-07-15 18:39:42 -07:00
Andreas Gampe
06eb24d95e
Frameworks/base: Fix braino missing line
...
This got accidentally deleted in cleanup.
Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
2016-07-15 18:13:48 -07:00
Adam Lesinski
aa19d5e49e
Deprecate Resources constructor and updateConfiguration() method
...
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().
Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
2016-07-15 18:01:48 -07:00
Andrew Solovay
9861e15482
Merge \"Merge \\\"docs: Updating N Preview \\\"behavior changes\\\" doc for DP5\\\" into nyc-dev am: 9d3bc86207 am: 72022a691a\" into nyc-mr1-dev-plus-aosp
...
am: 4eb66d1d4b
2016-07-16 00:49:45 +00:00
Andrew Solovay
731d2f5678
Merge \\\"docs: Updating N Preview \\\"behavior changes\\\" doc for DP5\\\" into nyc-dev am: 9d3bc86207 am: 8af870a778
...
am: 7097984ba5
2016-07-16 00:49:41 +00:00
Android Build Merger (Role)
4eb66d1d4b
Merge "Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 am: 72022a691a" into nyc-mr1-dev-plus-aosp
2016-07-16 00:41:57 +00:00
Andrew Solovay
45368cd044
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207
...
am: 72022a691a
2016-07-16 00:41:33 +00:00
Andrew Solovay
7097984ba5
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207
...
am: 8af870a778
2016-07-16 00:41:16 +00:00
Andrew Solovay
93a074c7c2
Merge \"Merge \\\"docs: Updating N Preview \\\"API Overview\\\" doc for DP5\\\" into nyc-dev am: 833722e049 am: f5f50cfc7a\" into nyc-mr1-dev-plus-aosp
...
am: f00bbba326
2016-07-16 00:35:50 +00:00
Andrew Solovay
3e40041ec6
Merge \\\"docs: Updating N Preview \\\"API Overview\\\" doc for DP5\\\" into nyc-dev am: 833722e049 am: 843979a3b3
...
am: 3cbde13f9e
2016-07-16 00:35:47 +00:00
Andrew Solovay
72022a691a
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
...
am: 9d3bc86207
2016-07-16 00:35:41 +00:00
Andrew Solovay
8af870a778
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
...
am: 9d3bc86207
2016-07-16 00:35:31 +00:00
Android Build Merger (Role)
f00bbba326
Merge "Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 am: f5f50cfc7a" into nyc-mr1-dev-plus-aosp
2016-07-16 00:30:15 +00:00
Andrew Solovay
d8333334f8
Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049
...
am: f5f50cfc7a
2016-07-16 00:29:49 +00:00
Andrew Solovay
3cbde13f9e
Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049
...
am: 843979a3b3
2016-07-16 00:28:26 +00:00
TreeHugger Robot
9d3bc86207
Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev
2016-07-16 00:24:49 +00:00
Andrew Solovay
f5f50cfc7a
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
...
am: 833722e049
2016-07-16 00:23:00 +00:00
Andrew Solovay
843979a3b3
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
...
am: 833722e049
2016-07-16 00:22:59 +00:00
Amith Yamasani
973fe42f8f
Merge \\"Block camera gesture during secondary user SUW\\" into nyc-mr1-dev am: e1a3a449a4
...
am: d0cecf9d67
2016-07-16 00:22:04 +00:00
TreeHugger Robot
833722e049
Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev
2016-07-16 00:13:17 +00:00
Steve McKay
ae267cedce
Merge \\"Include an app icon.\\" into nyc-mr1-dev am: 3d8c9981b5
...
am: a8387db55e
2016-07-16 00:12:53 +00:00
Amith Yamasani
d0cecf9d67
Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev
...
am: e1a3a449a4
2016-07-16 00:12:03 +00:00
Steve McKay
a8387db55e
Merge \"Include an app icon.\" into nyc-mr1-dev
...
am: 3d8c9981b5
2016-07-16 00:06:10 +00:00
Doris Liu
58eaa13f18
Merge \\"Ensure native allocation/free is correctly registered\\" into nyc-mr1-dev am: a7272b4cad
...
am: f5b87ce908
2016-07-16 00:04:42 +00:00
TreeHugger Robot
e1a3a449a4
Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev
2016-07-16 00:03:52 +00:00
TreeHugger Robot
3d8c9981b5
Merge "Include an app icon." into nyc-mr1-dev
2016-07-15 23:59:46 +00:00
Doris Liu
f5b87ce908
Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
...
am: a7272b4cad
2016-07-15 23:56:24 +00:00
Makoto Onuki
17e94691c2
Merge \\"Don\\'t accept resource references in string fields\\" into nyc-mr1-dev am: 6fa0e4d518
...
am: 3d3e2e2b17
2016-07-15 23:56:03 +00:00
Makoto Onuki
3d3e2e2b17
Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
...
am: 6fa0e4d518
2016-07-15 23:50:51 +00:00
Doris Liu
a7272b4cad
Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev
2016-07-15 23:46:08 +00:00
Makoto Onuki
6fa0e4d518
Merge "Don't accept resource references in string fields" into nyc-mr1-dev
2016-07-15 23:41:11 +00:00
Jeff Sharkey
8dd615fd07
Merge \"Merge \\"Build both filename views before deleting.\\" into nyc-mr1-dev am: fff6a11438\" into nyc-mr1-dev-plus-aosp
...
am: 40a4bf7dc1
2016-07-15 23:37:29 +00:00
Andrew Solovay
b098fbedd3
Merge \\\"docs: Updating N Preview release notes for DP5\\\" into nyc-dev am: b91693fedd am: 5de36f1ba0
...
am: 64c147b2cd
2016-07-15 23:37:21 +00:00
Andrew Solovay
95bd282dce
Merge \\\"docs: Updating N Preview release notes for DP5\\\" into nyc-dev am: b91693fedd am: e4846ae107
...
am: 91eaa3ec0e
2016-07-15 23:35:12 +00:00
Andrew Solovay
342bc638cd
Merge \"Merge \\\"docs: Describe how to update N Preview test devices on N release\\\" into nyc-dev am: 085b4e8f7b am: 64e25cf4d3\" into nyc-mr1-dev-plus-aosp
...
am: 8ff25378a0
2016-07-15 23:35:05 +00:00
