119658 Commits

Author SHA1 Message Date
Dianne Hackborn
785d764bd5 Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 2014-03-07 18:12:30 +00:00
Andy McFadden
66069adb9d am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit 'cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
2014-03-07 17:46:42 +00:00
Andy McFadden
cda61e95f6 am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit 'faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
2014-03-07 17:43:40 +00:00
Andy McFadden
faddd77a91 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2014-03-07 17:40:40 +00:00
Craig Mautner
2c82c08a54 Show the keyguard if unsecure window on top. DO NOT MERGE.
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
2014-03-07 09:09:27 -08:00
Leon Scroggins III
278250dafb DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

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

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
2014-03-07 11:28:44 -05:00
Chris Wren
d1862dac05 am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '111e981dc7f7d62647d6aa5e6c44cfd13af53608':
  use relative positioning for notification actions
2014-03-07 15:15:08 +00:00
Chris Wren
111e981dc7 am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
  use relative positioning for notification actions
2014-03-07 15:10:47 +00:00
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Jeff Brown
840c84749a Merge "Add config_supportAutoRotation." into klp-modular-dev 2014-03-07 04:40:10 +00:00
Jeff Brown
7ddc3cec32 Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 2014-03-07 04:39:06 +00:00
Jeff Brown
bcdfc62ae3 Add config_supportAutoRotation.
On some products, it may not make sense to use the accelerometer
to perform auto-rotation.  In that case, the product's config.xml
framework resource overlay should set config_supportAutoRotation
to false.

Setting this to false also disables auto-rotation settings.

Bug: 13211999
Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
2014-03-06 19:57:59 -08:00
Jeff Brown
e7be7915a3 Reorder config.xml constants related to auto-rotation.
Make it a little easier to find all of the relevant resources
in one place.  No functional changes.

Bug: 13211999
Change-Id: Ibfe48f48eae282fa09c95138983dab5e979a866c
2014-03-06 18:16:34 -08:00
Adam Powell
c9e5f540a9 Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
2014-03-06 17:57:05 -08:00
Dianne Hackborn
cb15c7a83b More on issue #12031685 (DO NOT MERGE)
Integrate from master:

Fix issue #13065185: Frequent runtime restarts on launching...

..."Hill Climb Racing" app

A service is in use when it is in the restarting state.

Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
2014-03-06 17:39:11 -08:00
Marco Nelissen
b2c45abc1d am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '233e7e9f64be5e85196dd959824bce9a69b2fd99':
  ExifInterface: fix class load failure
2014-03-07 01:31:22 +00:00
Dianne Hackborn
c71c901ad4 am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '278fa87cc9a5e08d410c5b1e6c75afcffc22a988':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
2014-03-07 01:31:17 +00:00
Marco Nelissen
233e7e9f64 am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '98a6bcf433fc23c343343b04c57c5a68d0177ac7':
  ExifInterface: fix class load failure
2014-03-07 01:26:10 +00:00
Dianne Hackborn
278fa87cc9 am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '430652c1e18c54dc6ae9debedb6394f2f1905903':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
2014-03-07 01:26:05 +00:00
Craig Mautner
f453f3a168 Merge "Show the keyguard if unsecure window on top" into klp-modular-dev 2014-03-07 01:25:50 +00:00
Marco Nelissen
98a6bcf433 Merge "ExifInterface: fix class load failure" into klp-dev 2014-03-07 01:16:50 +00:00
Dianne Hackborn
430652c1e1 Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 2014-03-07 01:04:50 +00:00
Will Haldean Brown
da9a956bd8 Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev 2014-03-07 00:56:05 +00:00
Zhijun He
9f97ac433a ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni

b/12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
2014-03-06 16:54:05 -08:00
Svetoslav
3cd04c99ac am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit 'd2a244f9767ee678d3971c9ad43a07100db4e8c9':
  ProgressBar is important for accessibility by default.
2014-03-07 00:47:17 +00:00
Marco Nelissen
e1af0bd858 am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
  libexif is now libjhead
2014-03-07 00:47:02 +00:00
Jay Shrauner
d96e021a9e am 1276295b: (-s ours) am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit '1276295b6b157b583480fbdf2be72b9bc0fb1c54':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
2014-03-07 00:39:49 +00:00
Svetoslav
d2a244f976 am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '8cb232cb796718ad91e56672a2c8fdbf88633001':
  ProgressBar is important for accessibility by default.
2014-03-07 00:39:05 +00:00
Marco Nelissen
4f36104f06 am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit 'e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
  libexif is now libjhead
2014-03-07 00:38:48 +00:00
Svetoslav
8cb232cb79 Merge "ProgressBar is important for accessibility by default." into klp-dev 2014-03-07 00:37:14 +00:00
Marco Nelissen
e29c96e7ae Merge "libexif is now libjhead" into klp-dev 2014-03-07 00:34:36 +00:00
Will Haldean Brown
434901078f Fix Theme.Micro to not request ActionBar.
This led to a crash for apps that use Theme.DeviceDefault, because it
requests both actionbar and swipe-to-dismiss.

Bug: 13348329
Change-Id: Iabc95600b19d842d02df4e92ab32327328f99be5
2014-03-06 16:17:38 -08:00
Marco Nelissen
c0786cc258 libexif is now libjhead
b/12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
2014-03-06 16:00:35 -08:00
Jay Shrauner
1276295b6b am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit 'a3ea4be5425fc2a561290c08a9f5f31f374afc31':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
2014-03-07 00:00:14 +00:00
Jay Shrauner
a3ea4be542 Prevent SpellChecker from setting invalid range - DO NOT MERGE
Add check for invalid range before setting for further check
at end of parse() loop.

Bug:12936072
Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
(cherry picked from commit ea4adf28474d949c51518a5abe6dbd3a3529cf29)
2014-03-06 22:29:12 +00:00
Takahiro Aizawa
092759f6b4 EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

Bug 13226025
(cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)

Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a
2014-03-06 14:18:44 -08:00
Leon Scroggins III
a4d7259c82 am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
  DO NOT MERGE - Fix Javadoc build break.
2014-03-06 22:09:41 +00:00
Leon Scroggins III
87e9e744ed am 92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9':
  DO NOT MERGE - Fix Javadoc build break.
2014-03-06 21:31:31 +00:00
Leon Scroggins III
92a3283286 DO NOT MERGE - Fix Javadoc build break.
Remove links to non-specific function name.

Bug: 13246311

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
2014-03-06 20:44:16 +00:00
Leon Scroggins III
337a200361 am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
* commit '8d3281f5f7a880b996e50d291ebb7154a486eb6c':
  Update framework to use M33 Skia. DO NOT MERGE
2014-03-06 20:06:14 +00:00
Eric Laurent
3260f25445 am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
  Fix RemoteController synchronization mode
2014-03-06 20:06:08 +00:00
Dianne Hackborn
76e1d76948 am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev
* commit '12caef7836a21fa20d052e4868df92e23b930cf6':
  Fix issue #11536426 DO NOT MERGE
2014-03-06 20:06:05 +00:00
Santos Cordon
5999904094 am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit 'abbd963e3c50f5241f9bf668b8b806c42a202621':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
2014-03-06 20:06:02 +00:00
Chris Wren
be63a95d2b use relative positioning for notification actions
Bug: 10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d
2014-03-06 14:55:23 -05:00
Leon Scroggins III
8d3281f5f7 am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
* commit 'ee008d4264a95bba5f90b17856fc06fa29a6f12c':
  Update framework to use M33 Skia. DO NOT MERGE
2014-03-06 19:49:58 +00:00
Eric Laurent
eac19754ca am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '617e715a40e2867c0b30d1bae38c20815ee30071':
  Fix RemoteController synchronization mode
2014-03-06 19:49:55 +00:00
Dianne Hackborn
12caef7836 am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev
* commit '71ab245a0d7830791cb89ec9130313620a1ee029':
  Fix issue #11536426 DO NOT MERGE
2014-03-06 19:49:52 +00:00
Santos Cordon
abbd963e3c am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit '4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
2014-03-06 19:49:46 +00:00
Filip Gruszczyński
fb71862d31 Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 2014-03-06 19:43:39 +00:00
Leon Scroggins III
ee008d4264 Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 2014-03-06 19:37:28 +00:00