122431 Commits

Author SHA1 Message Date
Ricardo Cervera
8caf1e6b31 am 0f38580f: am 6150b2c6: am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit '0f38580febcf9f2d71f7c1067cb00fe3b3f4476a':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:21:00 +00:00
Ricardo Cervera
0f38580feb am 6150b2c6: am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit '6150b2c6ac95dc9b0bd3556d6e542402b5899da6':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:18:07 +00:00
Ricardo Cervera
6150b2c6ac am 4f216e1d: am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit '4f216e1db9c01e5bbdf461fe25d41bad2874c082':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:13:41 +00:00
Ricardo Cervera
4f216e1db9 am c919f4f4: am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit 'c919f4f47787245ddda32d0e41e7bae0facd0ee8':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 13:11:13 -08:00
Ricardo Cervera
c919f4f477 am bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs
* commit 'bab2235ae89e37452e9be8a8b6d2581fe59e0162':
  docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
2014-01-15 21:07:21 +00:00
Ricardo Cervera
bab2235ae8 Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954" into klp-docs 2014-01-15 21:03:54 +00:00
John Spurlock
dd8877bced Merge "Tear down bars on destroy() and avoid null pointers." 2014-01-15 21:00:16 +00:00
Igor Murashkin
3242f4fb19 camera2: Fix @see being emitted into middle of javadoc (+more)
Other minor fixes:
- javadoc optional/FULL correctly emitted for properties lacking details
- javadoc details being incorrectly dedented before being rendered by
  markdown, causing spurious <code> blocks to be emitted

Bug: 12552669
Change-Id: I4c6615ec47810757b8348995db2b199222a3a77e
2014-01-15 12:27:41 -08:00
Chet Haase
c8f0b11cc4 Fix bug in PathMeasure with trimmed paths
Logic in the hardware renderer optimizes path rendering for simple
paths that consist of only rectangles. Any operation on the path that
adds any other primitive sets the simplicity flag to false appropriately.
PathMeasure.getSegment(), however, avoids those code paths and never sets
the mIsSimple flag at all, so it returns its original value (true, if the
path was simply constructed with no operations before being used in the
getSegment() call).

The fix is to avoid the optimization for paths used in getSegment(), since
it's not clear what operations will end up in the path and it's likely not
going to be just simple rectangles in any case.

Issue #12533902 PathMeasure.getSegment is broken

Change-Id: I71e77207e4d5c649c326557d33eba31e9b0fd45e
2014-01-15 12:12:20 -08:00
Jeff Hao
70216e599e am ac20b469: am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit 'ac20b469259129df948bae1fa5434098b1801185':
  Add sample profiling interface to startMethodTracing.
2014-01-15 19:50:53 +00:00
Jeff Hao
ac20b46925 am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '6c13f384749150e9fa6f930023a9161fe97402d0':
  Add sample profiling interface to startMethodTracing.
2014-01-15 19:48:18 +00:00
Jeff Hao
6c13f38474 am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '56b110649424534de36ca41b3e352a73b6bdf3c0':
  Add sample profiling interface to startMethodTracing.
2014-01-15 19:45:06 +00:00
Jeff Hao
56b1106494 am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
  Add sample profiling interface to startMethodTracing.
2014-01-15 11:41:30 -08:00
Jeff Hao
9a5005a3bf am f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit 'f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
  Add sample profiling interface to startMethodTracing.
2014-01-15 11:38:01 -08:00
Jeff Hao
f6730d2684 Merge "Add sample profiling interface to startMethodTracing." 2014-01-15 19:34:39 +00:00
Zhijun He
399f05d1e7 Camera2: Update awbMode related javadoc spec
Change-Id: I999d2bc94834c6f6d4483493707f05c92d7c5d67
2014-01-15 11:31:30 -08:00
Jeff Hao
d02e60fbd4 Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.

Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
2014-01-15 11:27:24 -08:00
Ricardo Cervera
980edc3ca1 docs: Aded uses-feature to multiple Google Play APK Filtering. Bug: 12271954
Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html
2014-01-15 11:25:10 -08:00
Leon Scroggins III
5aa3e4d58d Merge "Fix Javadoc build break." 2014-01-15 19:24:39 +00:00
Leon Scroggins III
2bc49ca96e Fix Javadoc build break.
Remove links to non-specific function name.

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
2014-01-15 14:23:14 -05:00
John Spurlock
ab847cf16d Tear down bars on destroy() and avoid null pointers.
Change-Id: Ie393689bbf2f0b28895bfde5098c883b5d4ea4a6
2014-01-15 14:18:43 -05:00
John Reck
81155da284 Merge "Remove dead code" 2014-01-15 18:57:13 +00:00
Leon Scroggins III
0102f8a87a In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Change-Id: If67da91484acc79f9f3dde6d05201409c0c75e41
2014-01-15 13:39:19 -05:00
Leon Scroggins III
f761fa7767 Merge "Remove calls to deprecated SkBitmap::setIsOpaque()" 2014-01-15 18:34:19 +00:00
Geoff Mendal
78604a2833 Merge "Import translations. DO NOT MERGE" 2014-01-15 18:24:04 +00:00
Geoff Mendal
282bcdd834 Import translations. DO NOT MERGE
Change-Id: I0116e137efa21bd9e8e3ba65fa05c7d84afb9e2c
Auto-generated-cl: translation import
2014-01-15 10:12:52 -08:00
quddusc
3a0ebd8957 am 4645edea: am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit '4645edeae0eec727909bcfe1ff7562ca4a7d1c80':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 18:11:32 +00:00
quddusc
59069f96fc docs: Removed obsolete screenshot of Play Store purchase flow.
Bug: 9846095

Change-Id: Ia3a7b69007964e73ee3ffe4825795814d3341340
2014-01-15 10:08:51 -08:00
quddusc
4645edeae0 am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit '25e1900beee4959be28ede9e00b8c5e8f10c1e17':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 18:08:32 +00:00
quddusc
25e1900bee am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit 'e8ae214c31b4c5c2e90538b9d0a5c258e32fafeb':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 18:04:31 +00:00
quddusc
e8ae214c31 am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit 'f40111731581f03dc1b447b432331b3415fb87b9':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 10:00:53 -08:00
Glenn Kasten
0c5b62744b Merge "Unhide android.media.AudioTrack.setVolume(float)" 2014-01-15 17:58:53 +00:00
quddusc
f401117315 am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs
* commit '31573d45933886237dd6414978486b79a4dd4f9f':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
2014-01-15 17:57:27 +00:00
quddusc
31573d4593 Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 2014-01-15 17:55:22 +00:00
John Reck
2114aef4ea Remove dead code
Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
2014-01-15 09:37:38 -08:00
Marco Nelissen
7a993a3d54 am 4e53edf7: am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '4e53edf7ea8f8158a123a451530146f23e3fed81':
  Before requerying a cursor, check if it is closed.
2014-01-15 17:33:42 +00:00
Marco Nelissen
4e53edf7ea am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit 'e495a5a3f3feec6319262a6bdab3b7704d6ab843':
  Before requerying a cursor, check if it is closed.
2014-01-15 17:29:43 +00:00
Marco Nelissen
e495a5a3f3 am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
  Before requerying a cursor, check if it is closed.
2014-01-15 17:27:19 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
2014-01-15 09:22:55 -08:00
Marco Nelissen
0d4916f19f am c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit 'c3036a12467395465b86e6935af8aa500c1b128d':
  Before requerying a cursor, check if it is closed.
2014-01-15 09:19:52 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Leon Scroggins III
8790be6de3 Remove calls to deprecated SkBitmap::setIsOpaque()
setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
2014-01-15 11:37:04 -05:00
Ashok Bhat
b091d47a2e AArch64: Use long for pointers in BitmapRegionDecoder
For storing pointers, long is used in BitmapRegionDecoder
class, as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.

Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:23:22 +00:00
Ashok Bhat
dcaf5593dd AArch64: Use long for pointers in Movie class
For storing pointers, long is used in Movie class,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-01-15 14:22:56 +00:00
Ashok Bhat
a0545dd54f AArch64: Add AssetInputStream.getNativeAsset
This patch adds AssetInputStream.getNativeAsset. This function
returns asset pointer, which can then be passed to JNI functions.
Note that this function is hidden and not part of Android API.

This function will eventually replace getAssetInt,
once all the classes that use getAssetInt are changed
to use getNativeAsset instead.

Change-Id: I2a2b2e6864f1f57ae2b3a10c45559b3635266ed5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-15 14:21:59 +00:00
Ashok Bhat
075e9a19ce AArch64: Use long for pointers in media classes
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-15 13:09:27 +00:00
Michael Jurka
cae6b43b03 Merge "Centering the crop by default in system wallpaper cropper" 2014-01-15 12:52:08 +00:00
Scott Main
f12b3fd617 Doc change: add Drive API feature page.
fix link text on several pages

Change-Id: I141e5b2cafe8c433861fa4f51aa9fc3843e7fba1
2014-01-14 18:47:34 -08:00
Alan Viverette
c6c243bf01 Merge "Propagate first call to DrawableContainer.setAlpha() to children" 2014-01-15 02:24:44 +00:00
Alan Viverette
34bd56b546 Propagate first call to DrawableContainer.setAlpha() to children
BUG: 12530662
Change-Id: Idd972698d1a6805cb9f66ba4c2ddde97e1f8d2ca
2014-01-14 18:19:09 -08:00