3407 Commits

Author SHA1 Message Date
Raph Levien
15cf4757dc Proper refcounting for Minikin objects
This patch introduces proper lifecycle maintenance (based on reference
counting) for Minkin objects, particularly FontFamily and
FontCollection. The patch depends on the corresponding Ref and Unref
methods being available in Minikin.

Change-Id: I91935e953d5a522e1adc496f2ce3a598be35de2b
2014-05-12 10:41:43 -07:00
Raph Levien
9a5b61ccc8 Parsing of XML font configuration files for Minikin
This patch improves Minikin-based font handling, to deal with error
conditions (missing fonts and so on), and also moves the parsing of
fallback_fonts.xml and system_fonts.xml into Java code.

Change-Id: Ib0debdbd56ad3b0196be6d2a35668d711c98f1e5
2014-05-12 10:41:42 -07:00
Raph Levien
1a73f732f9 Start of Minikin integration
This is the current state of the Minikin integration. All changes are
hidden behind USE_MINIKIN #ifdef, so it should be safe to apply. To
play with the Minikin branch, set this in your BoardConfig.mk .

This change also merges in 64-bit changes that were happenening in
parallel.

Change-Id: Idd94553bcbe324c5875d0ff06495c966c3e95b7f
2014-05-12 10:41:42 -07:00
Michael Wright
15c32f2699 Merge "Move key attribute information into KeyEvent." 2014-04-29 22:31:06 +00:00
John Reck
e45b1fd03b RenderThread animator support
Change-Id: Icf29098edfdaf7ed550bbe9d49e9eaefb4167084
2014-04-29 10:42:11 -07:00
Michael Wright
337d9d2edc Move key attribute information into KeyEvent.
This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.

It also moves the definition for all of the key names to the native
side, rather than having them in both places.

Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
2014-04-28 14:33:40 -07:00
Chris Craik
cc39e16cb9 Add elevation, Z properties to View
Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
2014-04-28 14:33:33 -07:00
Chris Craik
6689c9700d Merge "Support Oval GradientDrawable outlines, and ShapeDrawable" 2014-04-26 01:59:00 +00:00
Chris Craik
7979388d4f Support Oval GradientDrawable outlines, and ShapeDrawable
Change-Id: Ifc9e55757d3325cb28a1a812ec696512d4a18b39
2014-04-25 15:59:47 -07:00
Allen Hair
24a4ce3566 Merge "Fix nativeGetAnimationFrameStats to use the correct times." 2014-04-25 16:59:21 +00:00
Mark Salyzyn
7bdcc0b189 am fc02fcc8: am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit 'fc02fcc8a4ad181c44ca41a99cc86e1d23844d0c':
  jni: android_util_Process 64 bit issues
2014-04-24 22:19:51 +00:00
Mark Salyzyn
fc02fcc8a4 am eacaa353: am c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit 'eacaa353e83942d3c59d0db594df0fb6179e0eea':
  jni: android_util_Process 64 bit issues
2014-04-24 22:17:11 +00:00
Chris Craik
06916dcb05 Merge "Add floats-only drawRoundRect to Canvas" 2014-04-24 21:56:41 +00:00
Chris Craik
4d1c1538e2 Add floats-only drawRoundRect to Canvas
Change-Id: Ib0033a2d2486a808a44984ec4adf7fef76d9ea17
2014-04-24 14:23:52 -07:00
Mark Salyzyn
c6a410164e jni: android_util_Process 64 bit issues
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing

Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
2014-04-24 13:09:15 -07:00
Allen Hair
ac5eda366f Fix nativeGetAnimationFrameStats to use the correct times.
Changed the method to use actualPresentTimesNano instead of
desiredPresentTimesNano when initializing WindowAnimationFrameStats. The
WindowAnimationFrameStats.init(..) method expects the actual
presentation times, not the posted times.

Additionally, the desiredPresentTimesNano values are all invalid
(INT64_MAX) when working with window animation frames.

Change-Id: I5e5ce888dac859179ef06e4bbd8bfbd959521dd2
2014-04-24 12:12:18 -07:00
Aravind Akella
3f3823308a Merge "Bug fix for wakeup sensors." 2014-04-24 00:40:59 +00:00
Aravind Akella
35187bd5c1 Bug fix for wakeup sensors.
SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.
Bug: 9774884

Change-Id: I6cab0147c63f57a494a61f4dfe2a64a27dfe1b4e
2014-04-23 17:05:41 -07:00
Chris Craik
3f085429fd Clip TouchFeedbackDrawable effect to receiver Outline
Projected RenderNodes are now wrapped with a ClipRect or masked
SaveLayer, so that they are clipped to the outline of the projection
receiver surface.

Change-Id: I1d4afc1bb5d638d650bc0b1dac51a498f216773e
2014-04-23 16:15:11 -07:00
Michael Kolb
d36022901e am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp
* commit '7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc':
  jni: binder ptrdiff_t compile issues
2014-04-18 01:13:29 +00:00
Mark Salyzyn
c5aa56872d am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"
* commit '7423510c5a6a103a77efc36f064ed716f8810b97':
  jni: binder ptrdiff_t compile issues
2014-04-18 00:47:47 +00:00
Mark Salyzyn
5b6da1aee8 jni: binder ptrdiff_t compile issues
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
2014-04-17 17:25:36 -07:00
Mark Salyzyn
8a61140034 am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"
* commit 'dc500d2d567b37c620308bc8f0b0928eba4a2f5b':
  jni: binder 64-bit compile issues
2014-04-17 23:33:58 +00:00
Mark Salyzyn
dc500d2d56 am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"
* commit '4037847c0251a15ea88012a8405d0688c8b1ac53':
  jni: binder 64-bit compile issues
2014-04-17 23:22:34 +00:00
Mark Salyzyn
cfd91e7852 jni: binder 64-bit compile issues
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
2014-04-17 15:40:01 -07:00
Raph Levien
0613657426 Merge changes Ia693f512,If3b7d41f
* changes:
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
2014-04-17 19:21:14 +00:00
Raph Levien
53c0077256 Add elegantTextHeight text appearance attribute
This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.

The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.

The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.

Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
2014-04-17 11:16:46 -07:00
Leon Scroggins
7085d138b2 Merge "Call SkShader::isOpaque() to determine opaqueness." 2014-04-17 17:25:22 +00:00
Skia_Android Canary Bot
5932b0d8fc Call SkShader::isOpaque() to determine opaqueness.
It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().

Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
2014-04-17 09:55:59 -04:00
John Reck
c731435649 Merge "Add missing resume() call" 2014-04-17 04:36:52 +00:00
John Reck
6f07a0dc87 Add missing resume() call
Bug: 14087850

Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
2014-04-16 21:32:25 -07:00
Mark Salyzyn
2f894fec5b am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"
* commit '24dbfdaa701a729e3b231db63787e0d636b7cc3b':
  frameworks: 64 bit compile issues
2014-04-16 19:58:26 +00:00
Mark Salyzyn
24dbfdaa70 am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"
* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
  frameworks: 64 bit compile issues
2014-04-16 19:51:10 +00:00
Mark Salyzyn
853940331f frameworks: 64 bit compile issues
ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)

Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
2014-04-16 10:43:48 -07:00
John Reck
e8a866d4a4 Merge "Fix issue with bitmap uploading" 2014-04-14 20:57:38 +00:00
John Reck
860d155f86 Fix issue with bitmap uploading
Bug: 13912749

Change-Id: Ic23fa1d280118dc93dc2716a4a24cc0bbbdca595
2014-04-14 13:17:25 -07:00
John Reck
fae904d639 Fence on destruction
Bug: 14052927
 destroyCanvasAndSurface() needs a fence as when it returns the
 underlying BufferQueue is going to be released from under
 the render thread.

Change-Id: I0147a1d5ec5adf0239c761ef22f65cd8c8a137df
2014-04-14 12:44:53 -07:00
John Reck
c70f3db80a Merge "Simplify matrix calculations" 2014-04-11 20:14:46 +00:00
John Reck
f7483e3af0 Simplify matrix calculations
Bug: 13913604

Change-Id: I2c0f85a34e1e520050a5a6131306d6b7c352d827
2014-04-11 12:57:53 -07:00
Aravind Akella
d951ab230d am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit '8ebd66c259602f6b0be26fdfd3fe2f55538f6424':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-11 19:40:31 +00:00
Aravind Akella
8ebd66c259 am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit 'cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-11 19:34:51 +00:00
Aravind Akella
cd4c1c714c Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev 2014-04-11 19:32:38 +00:00
Aravind Akella
cd9a7bb3ba Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
This reverts commit 819239e5bec90ee3c861ac45fffac4a832a183a1.

Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
2014-04-11 00:05:24 +00:00
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
John Reck
d3d8dafc2f Make attachFunctor blocking
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
2014-04-10 15:00:13 -07:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
2014-04-10 10:38:31 +01:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
2014-04-10 09:26:44 +00:00
Narayan Kamath
80413c9fe1 Merge "Re-implement native library search and copies." 2014-04-10 09:19:38 +00:00
John Reck
f4198b713e Merge hasFunctors & pushStaging into prepareTree
Bug: 13902607
 Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
2014-04-09 17:00:04 -07:00