113121 Commits

Author SHA1 Message Date
Svetoslav
6d0db04bed am 7b3990ec: Merge "Update the print dialog." into klp-dev
* commit '7b3990ec81fc218f655d44624758e15ce378968e':
  Update the print dialog.
2013-09-18 14:12:58 -07:00
Svetoslav Ganov
107218d741 am f5293b6b: Merge "The printers in print dialog should not change position." into klp-dev
* commit 'f5293b6bc0567be58ac3039691ec1cf9455dc28e':
  The printers in print dialog should not change position.
2013-09-18 14:09:29 -07:00
Svetoslav
7b3990ec81 Merge "Update the print dialog." into klp-dev 2013-09-18 21:08:49 +00:00
Svetoslav Ganov
f5293b6bc0 Merge "The printers in print dialog should not change position." into klp-dev 2013-09-18 21:06:39 +00:00
Raph Levien
954f0d7b77 am ba1abbba: Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev
* commit 'ba1abbba1f140f4be5956ade8ffd4ef4b3f9ffe0':
  Revert "Revert "Take the input device into account for meta state""
2013-09-18 13:42:41 -07:00
Raph Levien
ba1abbba1f Merge "Revert "Revert "Take the input device into account for meta state""" into klp-dev 2013-09-18 20:40:26 +00:00
Amith Yamasani
b129e9466f am a6f387a0: Merge "Don\'t handle click if the resolver is already finishing." into klp-dev
* commit 'a6f387a0551a82b76e86ae829ae3a39ad043c1c9':
  Don't handle click if the resolver is already finishing.
2013-09-18 13:37:05 -07:00
Dianne Hackborn
1995a7de5b am b9466db4: Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev
* commit 'b9466db4a56564101a26865962dda87aaeab56ff':
  Finish issue #10779747: Calendar Storage crash observed...
2013-09-18 13:37:02 -07:00
Amith Yamasani
a6f387a055 Merge "Don't handle click if the resolver is already finishing." into klp-dev 2013-09-18 20:35:12 +00:00
Dianne Hackborn
b9466db4a5 Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev 2013-09-18 20:34:11 +00:00
Kenny Root
faebc6470d am bd49a1da: Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev
* commit 'bd49a1dadfbd7803642066a5bdc74305a1b2340b':
  Change case of "keyset" to "keySet" for manifests
2013-09-18 13:16:48 -07:00
Amith Yamasani
07cd351b4a Don't handle click if the resolver is already finishing.
Fixes bug that double tapping on an entry in the intent disambig dialog
can result in the picked activity being launched twice.

Bug: 10770501
Change-Id: Ibb7c6bea5f3c25fa204a2f0e65c8044c2a2549f7
2013-09-18 13:16:00 -07:00
Kenny Root
bd49a1dadf Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev 2013-09-18 20:15:26 +00:00
Jonathan Dixon
515134e88c am c7969dea: Merge "Fix obsolete API reference" into klp-dev
* commit 'c7969dea24f2e362f69fb2b912c8a0385f5dc617':
  Fix obsolete API reference
2013-09-18 13:10:15 -07:00
Jason Monk
fd4cf80003 am 90701f1a: Merge "PAC Local Proxy to only receive lo connections" into klp-dev
* commit '90701f1adada98f1db5a90abbc6af29f4794d70a':
  PAC Local Proxy to only receive lo connections
2013-09-18 13:06:48 -07:00
Jonathan Dixon
c7969dea24 Merge "Fix obsolete API reference" into klp-dev 2013-09-18 20:06:20 +00:00
Jason Monk
90701f1ada Merge "PAC Local Proxy to only receive lo connections" into klp-dev 2013-09-18 20:04:32 +00:00
Raph Levien
14f10e5d5f Revert "Revert "Take the input device into account for meta state""
This reverts commit 3954fd9a05232cb6f7fc52aa49a0b34c1539028a, which
is equivalent to re-applying 8a1597b39632956cdbcb6b76874ccca786047d4c.

The change ("Take the input device into account for meta state") was
valid but caused CTS test failures because the test was wrong. The
test injected a key event with the meta state missing. This faulty
test was masked by the old toggle behavior.
2013-09-18 13:01:11 -07:00
Jonathan Dixon
df3859ebeb Fix obsolete API reference
Bug 10361803

exportToPdf use-case not supported in K so removing that dangling
reference from the javadoc

Change-Id: Ia0fe3aa9ed5150639d1f72341c89568a0a7e1c7d
2013-09-18 12:51:47 -07:00
Craig Mautner
566f7fede1 am 138685d9: Merge "Move flag for home launching from activity to task." into klp-dev
* commit '138685d9db005cbd62ede45eb066a2e672db9588':
  Move flag for home launching from activity to task.
2013-09-18 12:50:31 -07:00
Raph Levien
21b0c88b3c am c540f8e9: Merge "Revert "Take the input device into account for meta state"" into klp-dev
* commit 'c540f8e9d704414a06f7a5b4ade1c713042f8c38':
  Revert "Take the input device into account for meta state"
2013-09-18 12:46:57 -07:00
Craig Mautner
138685d9db Merge "Move flag for home launching from activity to task." into klp-dev 2013-09-18 19:46:53 +00:00
Raph Levien
c540f8e9d7 Merge "Revert "Take the input device into account for meta state"" into klp-dev 2013-09-18 19:44:16 +00:00
Svetoslav
013b816ac7 Update the print dialog.
1. The print dialog was resizable and as a result when printers
   come and go its size changes which looks bad. The dialog is
   now trying to be maximally large limited by a max size or the
   screen - whichever is smaller. This required moving from
   GridLayout to several LinearLayouts since the former does not
   support distribution of empty space evently between the items
   in a row. Also we want all items in a column of inputs to be
   of equal size (the spinners specifically).

2. Added labeledBy attribute to associate a view with another one
   that serves as its label for accessibility purposes. We have
   lebelFor attribute but it is not useful in most layout files
   since it has to refer the auto-generated id of a view which
   usually appears later in the layout file, thus generating a
   compilation error. This was needed for the accessibility support
   of the print dialog.

bug:10631660

2. Disabling the spinners or the print button did not produce
   visual feedback leading to user frustration.

bug:10741907

Change-Id: I0c12eddabc4035bc7becd1b86c1f1b8fdcf4289c
2013-09-18 12:31:26 -07:00
Jonathan Dixon
b7bdf38bf1 am 01fc0884: Merge "Update APIs for the Chromium WebView" into klp-dev
* commit '01fc088462d05478bcdf416fb02532d53e85dd6a':
  Update APIs for the Chromium WebView
2013-09-18 12:17:58 -07:00
Jonathan Dixon
01fc088462 Merge "Update APIs for the Chromium WebView" into klp-dev 2013-09-18 19:14:09 +00:00
Dianne Hackborn
6285a32f74 Finish issue #10779747: Calendar Storage crash observed...
...while setting up a new user from settings.

We can now delay broadcasts when there are enough background services
currently starting (still set to 1 for svelte devices, 3 for normal
devices).

Add new intent flag to not allow receivers to abort broadcasts, which
I use to fix an issue with the initial BOOT_COMPLETED broadcast not
actually requesting pss data at the right time -- it can now be sent
as an ordered broadcast without the ability for the receivers to cancel
it.

Change-Id: I51155bbbabe23e187003f3e2abd7b754e55d3c95
2013-09-18 12:09:47 -07:00
Craig Mautner
ae7ecab400 Move flag for home launching from activity to task.
The variable ActivityRecord.mLaunchHomeTaskNext was used to indicate
that the home task should be launched when the activity completed.
This only mattered when it was at the end of a task. As the activity
launched other activities within the same task it needed to be
migrated from activity to activity and task to task. This became
too complicated and was at the wrong level to begin with.

By moving the flag to TaskRecord.mOnTopOfHome the logic is simpler
and the results more predictable.

Fixes bug 10602256.

Change-Id: If0b752522b77be9918f1dba221d0ff670fc01af8
2013-09-18 11:48:14 -07:00
Svetoslav Ganov
10ee84ba18 The printers in print dialog should not change position.
The FusedPrintersProvider was not ensuring the existing printers
are at the same position when a new dataset is loaded. As a result
the printers were moving in the UI and sometimes the currently
selected one changed. Now the provider makes sure printers are in
the same position.

bug:10748884

Change-Id: I7c6cd5b1b38fdb615ceaae87806b413272ffba18
2013-09-18 11:34:24 -07:00
Kenny Root
add560288a Change case of "keyset" to "keySet" for manifests
Bug: 10461185
Change-Id: Ibfe8cc6e716ac8b76ed7c05c26c332673479b7d8
2013-09-18 11:16:49 -07:00
Raph Levien
3954fd9a05 Revert "Take the input device into account for meta state"
This reverts commit 8a1597b39632956cdbcb6b76874ccca786047d4c. That
commit broke some of the handling of meta state, which in turn caused
CTS test failures, notably bug 10210151 (CTS:
android.text.method.cts.BaseKeyListenerTest#testBackspace_withSendKeys
is failing on KLP).

So this revert fixes those test failures, but leaves bug 8303489
(Pressing shift on the hardware keyboard messes with unrelated
keypresses, including virtual ones) still present. We'll plan to
address that in a future release.

Change-Id: Iea42c643b6d08f33cbd2ed1747e8de3b5f8116a6
2013-09-18 11:03:02 -07:00
Amith Yamasani
a8b4da872a am 840b3bd6: Merge "Fix provider leak in PFD" into klp-dev
* commit '840b3bd61185456ccb574c2be115ea78ec418327':
  Fix provider leak in PFD
2013-09-18 11:02:59 -07:00
Amith Yamasani
840b3bd611 Merge "Fix provider leak in PFD" into klp-dev 2013-09-18 18:01:21 +00:00
Martijn Coenen
71e3aa2c6c am 807fd044: Merge "Validate AID format and length." into klp-dev
* commit '807fd0443564850bc69f229a282cbba990e1b656':
  Validate AID format and length.
2013-09-18 10:59:20 -07:00
Martijn Coenen
807fd04435 Merge "Validate AID format and length." into klp-dev 2013-09-18 17:56:03 +00:00
Chet Haase
c8bcf4f21a am d73d34c8: Merge "Use transition-only alpha property for fading transitions" into klp-dev
* commit 'd73d34c873dbf409af3cf6ecbf27cb2be3953b4f':
  Use transition-only alpha property for fading transitions
2013-09-18 10:55:46 -07:00
Leon Scroggins III
2e4e98895b am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev
* commit '3490228efb949ad1979c89bb206a3697f5ffc185':
  Use a native buffer for decoding images.
2013-09-18 10:55:43 -07:00
Zhijun He
30ba38ac78 am bf143ff1: Merge "ImageReader: disable NV21 support" into klp-dev
* commit 'bf143ff1955f9ec70fd9435240e3505c5df4804d':
  ImageReader: disable NV21 support
2013-09-18 10:52:14 -07:00
Chet Haase
07861ea82b am 4fa809fe: Merge "Fix leak fix in ViewTreeObserver" into klp-dev
* commit '4fa809fe74635720528ab46cff7d2ba0d0aebd8a':
  Fix leak fix in ViewTreeObserver
2013-09-18 10:52:11 -07:00
Chet Haase
d73d34c873 Merge "Use transition-only alpha property for fading transitions" into klp-dev 2013-09-18 17:51:34 +00:00
Leon Scroggins III
3490228efb Merge "Use a native buffer for decoding images." into klp-dev 2013-09-18 17:50:56 +00:00
Zhijun He
bf143ff195 Merge "ImageReader: disable NV21 support" into klp-dev 2013-09-18 17:49:30 +00:00
Chet Haase
4fa809fe74 Merge "Fix leak fix in ViewTreeObserver" into klp-dev 2013-09-18 17:48:38 +00:00
Zhijun He
4eda9f5359 ImageReader: disable NV21 support
Bug: 10787131
Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
2013-09-18 10:30:50 -07:00
Lajos Molnar
0fe0fe9501 am b8462457: Merge "Misc. media API changes" into klp-dev
* commit 'b84624571ba2d0431dda8fd7cd45ae995630dd17':
  Misc. media API changes
2013-09-18 10:24:16 -07:00
Lajos Molnar
b84624571b Merge "Misc. media API changes" into klp-dev 2013-09-18 17:20:08 +00:00
Lajos Molnar
e3d75c9dc8 am e23ce3b1: Merge "Add CaptioningManager listener Subtitle support." into klp-dev
* commit 'e23ce3b1fccd605ab696c120f86bd3912651731c':
  Add CaptioningManager listener Subtitle support.
2013-09-18 09:49:49 -07:00
Lajos Molnar
e23ce3b1fc Merge "Add CaptioningManager listener Subtitle support." into klp-dev 2013-09-18 16:46:39 +00:00
Amith Yamasani
487c11a310 Fix provider leak in PFD
Code path to release content provider associated with the PFD was
inadvertently bypassed by a previous change. Reinstate that code
when closing the PFD.

Bug: 10767447
Change-Id: I23306cfb3c28c99e587892b17ca85efd3f7a8a07
2013-09-18 09:30:43 -07:00
Leon Scroggins III
7315f1baee Use a native buffer for decoding images.
Fixes BUG:10725383

Depends on https://googleplex-android-review.git.corp.google.com/#/c/357300/
in external/skia.

In the previous fix for BUG:8432093 and BUG:6493544
(https://googleplex-android-review.googlesource.com/#/c/346191/),
instead of calling mark on the provided input stream, we
copied the entire stream in native code (except in one case;
more details below), allowing rewind no matter how much of
the stream had been read. This was because two decoders
may rewind after reading an arbitrary amount of the stream:
SkImageDecoder_wbmp and SkImageDecoder_libjpeg.

It turns out that the jpeg decoder does not need this rewind
after arbitrary length (it is a failure recovery case, and
libjpeg has a default recovery we can use - the above referenced
CL in Skia uses the default).

Although the wbmp decoder could read any amount given a
stream with the "right" data, and then return false, such a
stream would not be a valid stream of another format, so it
is okay for this rewind to fail.

Further, the previous fix was inefficient in the common case
where the caller decodes just the bounds, resets, then decodes
the entire image (since we have copied the entire stream twice).
The copy also resulted in the crashes seen in BUG:10725383.

In this CL, buffer only the amount of input needed by
SkImageDecoder::Factory to determine the type of image decoder
needed. Do not mark the input stream provided by the caller,
so their mark (if any) can remain in tact. The new Skia class
SkFrontBufferedStream allows buffering just the beginning
of the stream.

core/jni/android/graphics/BitmapFactory.cpp:
Instead of calling GetRewindableStream (which has been removed),
call CreateJavaInputStreamAdaptor. Then wrap it in an
SkFrontBufferedStream, with a large enough buffer to determine
which type of image is used.

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h:
core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp:
Remove mark, markSupported, and rewind. CreateJavaInputStreamAdaptor
now turns an SkStream which is not rewindable. If the caller
needs rewind that needs to be handled differently (for example,
by using SkFrontBufferedStream, as is done in BitmapFactory and
Movie.
Remove RewindableJavaStream and GetRewindableStream.
Remove code specific to ByteArrayInputStream, which makes slow
JNI calls. Instead, depend on the caller to buffer the input
in the general case. There is no reason to special case this
stream (especially since we already have decodeByteArray).
Remove CheckForAssetStream, which is now always special cased
in Java.

core/jni/android/graphics/Movie.cpp:
Call CreateJavaInputStreamAdaptor and use an SkFrontBufferedStream.
Add a native function for decoding an Asset, and remove old
call to CheckForAssetStream.

graphics/java/android/graphics/BitmapFactory.java:
Write a helper function for decoding a stream to consolidate
common code.
Buffer enough of the input so that SkImageDecoder::Factory
can rewind after having read enough to determine the type.
Unlike the old code, do NOT mark the caller's stream. This is
handled in native code. The caller's mark (if any) is left alone.

graphics/java/android/graphics/Movie.java:
Check for an Asset stream before passing to native, and
call a native function for handling the asset directly.

BUG:6493544
BUG:8432093
BUG:10725383

Change-Id: Ide74d3606ff4bb2a8c6cdbf11bae3f96696f331a
2013-09-18 12:01:20 -04:00