3673 Commits

Author SHA1 Message Date
Raph Levien
466cd7a2a6 Merge "Clean up dirFlags / bidiFlags confusion" 2014-06-16 22:12:26 +00:00
Raph Levien
051910b9f9 Clean up dirFlags / bidiFlags confusion
The dirFlags and bidiFlags enums are distinct, and have different
meanings. The former is a determined direction for a run of text, while
the latter is a request for the bidi algorithm. They have been used
interchangeably, and this has caused some problems, notably running the
bidi algorithm needlessly when the direction for a run is already
determined.

This patch cleans up the confusion, by always naming each occurrence
explicitly "boolean isRtl" or "int bidiFlags" (the previous code often
just used "int flags", which added to the confusion), and converts
between the meanings when a function takes an isRtl argument but passes
it to another function expecting bidiFlags.

Fixes b/15089607 Clean up bidi flag mess

Change-Id: I410b6604376e853dd12c255e7f5a9d2b9a310dd9
2014-06-16 14:36:08 -07:00
Colin Cross
022fa3b057 am 289476b6: am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"
* commit '289476b65b8129729936f75a3549eb99257df482':
  clean up native com.android.internal.os.Zygote
2014-06-16 22:13:18 +00:00
Colin Cross
289476b65b am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"
* commit 'a803542aad4a58fe2446b8bf9cc4a4f59942d084':
  clean up native com.android.internal.os.Zygote
2014-06-16 20:19:05 +00:00
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Colin Cross
18cd9f5762 clean up native com.android.internal.os.Zygote
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
2014-06-16 12:22:56 -07:00
Nick Kralevich
5f20e1ae8d am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver"
* commit '23315095f1d1f647311ad0fcf05ddb152ad9452d':
  update mLastSlash for gdbserver
2014-06-14 09:05:57 +00:00
Nick Kralevich
195b23ef71 update mLastSlash for gdbserver
the gdbserver special case wasn't updating mLastSlash. Fix it.

Change-Id: I63d64bb5f543bd2df6183649cf727e830731e144
2014-06-13 16:24:58 -07:00
Calin Juravle
cdd1fd7a8f am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 17:32:50 +00:00
Calin Juravle
5fc4e48742 am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
  Improved profile.start-immediately comment
2014-06-11 17:32:40 +00:00
Nick Kralevich
6e3a1c2bb2 am 5f20e1ae: am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver"
* commit '5f20e1ae8df262ac777944f00b685f0cf2fe4458':
  update mLastSlash for gdbserver
2014-06-14 09:44:15 +00:00
Calin Juravle
994cd28e72 Shrink profiler.start-immediately to fit in the maximum property size
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
2014-06-11 18:21:41 +01:00
John Reck
816f71b7e0 Merge "Move LayerType to RenderNode" 2014-06-12 05:34:42 +00:00
John Reck
25fbb3fa11 Move LayerType to RenderNode
Change-Id: Icb79a5015cb0362b1f3a66d09007450730135a97
2014-06-12 19:25:33 -07:00
John Reck
a447d29c65 Fix DA bugs
* Now aware of transform of DrawDisplayListOp
 * Supports projection

 Bug: 15539677
 Bug: 15506680

Change-Id: Ic16f482cd48c3add12e49eca529281be12b93491
2014-06-12 09:13:45 -07:00
Aravind Akella
221748039c Merge "Add java APIs for Sensor reportingMode." 2014-06-12 03:30:50 +00:00
Jeff Brown
98908aa0c9 Merge "Add call to set power mode for display" 2014-06-12 17:09:07 +00:00
John Reck
e830c37a4a Merge "Fix DA bugs" 2014-06-10 21:38:43 +00:00
Andy McFadden
564dae50b5 Merge "Delete a local ref in getSurface" 2014-06-12 03:30:50 +00:00
Andy McFadden
5ad3ab8a16 Delete a local ref in getSurface
ANativeWindow_fromSurface() provides a native-only call path to
android_view_Surface_getSurface(), so we need to clean up the
local reference.

Bug 14087233

Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9
2014-06-11 15:22:32 -07:00
Florin Malita
cf6edd2b22 Merge "Pass full matrix + clip save flags to the native SkCanvas." 2014-06-10 21:32:31 +00:00
Leon Scroggins
84ecb7e1aa Merge "remove call to (deprecated) SetDeviceConfig" 2014-06-10 21:44:22 +00:00
Mike Reed
2216f9c2e5 remove call to (deprecated) SetDeviceConfig
this was ignored by all callers, in that they always specify a preferred config (8888).

This removal will allow skia to remove the api and its global.

Change-Id: Ic0a4c673ddd60d0078f75e0e482aba4c9b9cf682
2014-06-11 16:08:31 +00:00
Leon Scroggins III
17a8bfc38a In Bitmap.reconfigure, update the pixelref's info.
This fixes CTS tests which are crashing on an SkASSERT due to a
mismatch of SkImageInfo between the SkPixelRef and SkBitmap.

Also directly call ref() and unref() instead of SkSafeRef/SkSafeUnref,
since we would already crash if the SkPixelRef in question was NULL.

Also if the user attempts to reconfigure to 4444, use 8888 instead.

Change-Id: I473ef225c6cd1c92d67ae103c53c6cff0dad92de
2014-06-11 18:53:42 -04:00
Robert Phillips
b59508fce5 Changes to framework for ToT Skia.
Consists of 3 cherry-pick from changes by robertphillips@google.com
in master-skia:

-----------------------------------------------------------------------

New AndroidPicture wrapper class

Address code review comments & use new SkPictureRecorder::partialReplay
entry point

Addressing code review issues

Switch MakePartialCopy to makePartialCopy

Conflicts:
	core/jni/android/graphics/Picture.cpp

Ie530ab15b3d549f0ecfb0ecc131f9144a7b72a91

Remove AndroidPicture from GraphicsJNI and split into .h and .cpp

-----------------------------------------------------------------------

Fix lingering legacy picture recording behavior
Address code review issues

Iaf870c2c400dbe70dc32d6d445574904f5ea718f

-----------------------------------------------------------------------

Update Android to new SkCanvas::drawPicture interface

As of Skia 9b14f26d (Alter SkCanvas::drawPicture (devirtualize,
take const SkPicture, take pointer) -
https://codereview.chromium.org/313613004) SkCanvas::drawPicture
has an alternate signature. The old entry point is deprecated.

I63395da61ecc3b58bfd2bc094752081f4b2f7535

-----------------------------------------------------------------------

Change-Id: I041133aeb5639abd853370e512acf93870f82aea
2014-06-11 18:27:48 -04:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
Calin Juravle
9c9777da68 am cdd1fd7a: am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit 'cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 21:38:43 +00:00
Calin Juravle
a48a6fd1f2 am 5fc4e487: am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '5fc4e487420b7730c9eaf2623ff1efd2633daba7':
  Improved profile.start-immediately comment
2014-06-11 21:38:38 +00:00
Florin Malita
b85056018b Pass full matrix + clip save flags to the native SkCanvas.
With granular state flags being deprecated, always pass full
save flags to the native canvas.

Legacy behavior is emulated in NativeCanvasWrapper, with a focus
on minimizing the overhead when there are no side effects to be
persisted.

Change-Id: Ifdad2ff9bb3a1f9736c6c41afc9ec6c07f62320e
2014-06-10 16:55:00 -04:00
Jean-Michel Trivi
8a21f5dd79 AudioManager: add ability to allocate a new session ID
Expose method to allocate a new session ID.
Make the generic error code public.

Change-Id: Iec93548292845e3a1b1a97be9bbe54e9fcf06f2d
2014-06-10 12:44:04 -07:00
Raph Levien
cc8f7ae682 Merge "Support fake italics" 2014-06-10 19:05:29 +00:00
Raph Levien
a7be5dd006 Merge "Support for fake bold in Minikin builds" 2014-06-10 19:05:20 +00:00
Raph Levien
0627ec08dc Support fake italics
This patch adds fake italics, using essentially the same mechanism as
the fake bold implementation. Also combines fake bold/italic settings
with ones explicitly set in the paint.

Change-Id: Ia7eb3ddc8a6192d191711ba723ffd0d1d9d93f2e
2014-06-10 11:49:44 -07:00
Raph Levien
1fc0fa87d4 Support for fake bold in Minikin builds
Part of the fix for bug 15436379 Fake bold doesn't fully work (Minikin)

This patch queries the Minikin layout for when fake bold is needed,
and applies that to both shaping and drawing paint.

Also simplifies refcounting (the lifetime of all MinikinFont objects
is subsumed by the enclosing FontCollection).

Note: the fake bold flag set by the user is ignored in this patch.

Fake italics would be possible using the same mechanism, but it's
slightly more complicated (fake and user-set textSkewX values would need
to be combined, and the latter restored after drawing).

Change-Id: Ica2c4604846cbb37e5a783778b18d8993c9d4563
2014-06-10 11:37:55 -07:00
Leon Scroggins III
cdb4a446de Merge "Fix a memory leak with empty screenshot." 2014-06-10 18:08:45 +00:00
Leon Scroggins III
e3f9800f38 Fix a memory leak with empty screenshot.
Use an autodeleter to delete the ScreenshotClient when it's not
needed.

Discovered while investigating BUG:15454296, but it does not fix
the problem.

Change-Id: I00ea81de15ddc2507d904a6c20af3c410f573dce
2014-06-10 13:19:35 -04:00
Calin Juravle
3f967910d9 Improved profile.start-immediately comment
Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e
2014-06-10 14:52:24 +01:00
Aravind Akella
27900358f2 Add java APIs for Sensor reportingMode.
Change-Id: Iba6bb11f990d9966b86bf02d70ced7312f3e64a8
2014-06-09 16:56:29 -07:00
Calin Juravle
66e29d08c7 am ee20e16d: am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit 'ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d':
  Fixed comments related to profile properties.
2014-06-09 10:05:04 +00:00
Calin Juravle
ee20e16d7b am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
  Fixed comments related to profile properties.
2014-06-09 09:56:37 +00:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties.
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
2014-06-09 10:13:55 +01:00
Raph Levien
71f75f1e7b Merge "Fix getFontMetrics problems" 2014-06-06 17:10:32 +00:00
Raph Levien
817ef4ae79 Fix getFontMetrics problems
Fixes a number of individual problems. In Minikin builds, gets base font
from TypefaceImpl rather than using whatever random font was in the
paint. Respects elegant metrics in ascent and descent methods as well as
getFontMetrics. Sets fixed ascent and descent values to 1900, -500,
which matches the Roboto font.

Part of the fix for bug 15467288 "Inconsistent line heights on
Minikin builds"

Change-Id: I12915f4a62de28932469c7279241eecf7320c47b
2014-06-06 10:06:01 -07:00
John Reck
743922e9df Merge changes Ie0773f85,Ie5e75505
* changes:
  Even FASTER damage calculations!
  Have all the setters return changed
2014-06-06 14:41:37 +00:00
Florin Malita
53be7b79fb Merge "Implement SkCanvasGlue::clipRegion() using clipPath()." 2014-06-06 14:04:32 +00:00
Calin Juravle
c09722dc55 am c88a5ac3: am d1d46d9d: am bbf849b1: Merge "Add missing profiler options."
* commit 'c88a5ac3ff0e3b3759c58279204bb8f6b8901669':
  Add missing profiler options.
2014-06-06 12:31:24 +00:00
Calin Juravle
c88a5ac3ff am d1d46d9d: am bbf849b1: Merge "Add missing profiler options."
* commit 'd1d46d9d5564a27dae45c2f2a62e6769402b556c':
  Add missing profiler options.
2014-06-06 12:28:17 +00:00
Calin Juravle
9828d067fb Add missing profiler options.
Bug: 12877748

Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
2014-06-06 12:55:23 +01:00
Eric Laurent
5edb85c17d Merge "add sound trigger JNI" 2014-06-05 21:04:50 +00:00
Florin Malita
1dc14ba388 Implement SkCanvasGlue::clipRegion() using clipPath().
(Canvas clipRegion() public API is scheduled for deprecation)

The SkCanvas clip stack does not support clipRegion() ops. Implementing
these in terms of clipPath() makes persisting clips for SaveFlags
emulation purposes a whole lot simpler.

Change-Id: I41d1eb9e292ce370fba224338f9071d5e4068621
2014-06-05 16:51:35 -04:00