51758 Commits

Author SHA1 Message Date
Leon Scroggins III
5f6aa983d6 Fix FILTER_BITMAP_FLAG regression in DrawFilter.
Skia removed the corresponding kFilterBitmapFlag, replacing it with a
separate function: setFilterLevel. If the flag is set, turn it into a
call to setFilterLevel.

Corresponds to changes in I2736f3f68683651574d79a169ff0ab563e0a469e to
fix Paint.setFlags().

BUG:15112859
Change-Id: I269cbd7a624e5dde5688305e1ba97075ba73f4fd
2014-05-27 12:15:32 -04:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Wonsik Kim
c3a6e23e3f am e32b2d32: Revert "Revert "Add physical TV input handling to TvInputManagerService""
* commit 'e32b2d32d7e4a492bb3038c7bc55988a908437a4':
  Revert "Revert "Add physical TV input handling to TvInputManagerService""
2014-05-27 04:08:51 +00:00
Wonsik Kim
c22dbb6919 Revert "Revert "Add physical TV input handling to TvInputManagerService""
This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215.

Bug: 14118245, Bug: 15197740
Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
2014-05-27 01:33:50 +00:00
Yohei Yukawa
c659053c4c Merge "Implement dynamic IME rotation based on user action" 2014-05-26 16:37:23 +00:00
Yohei Yukawa
a9bda77427 Implement dynamic IME rotation based on user action
With this CL, the IME rotation order will be updated dynamically
based on user actions on IMEs. Currently only onCommitText is
took into considered.

Imagine that we have the following rotation order.
  [A, B, C, D, E]
If a user action for C is observed, the rotation order will be
updated as follows:
  [C, A, B, D, E]
Then another user action for D updates the rotation order as
follows:
  [D, C, A, B, E]

BUG: 7043015
Change-Id: Ic005b94379f9d847ea87046473ed77d8018d930e
2014-05-27 01:32:30 +09:00
Yohann Roussel
f2fa9994ab Merge "A test application for Art bug 14256107" 2014-05-26 12:26:21 +00:00
Yuncheol Heo
1178cd29b2 Merge "Add the constants for the callback result of SendCecCommand()." 2014-05-26 02:45:40 +00:00
Yuncheol Heo
ece603b795 Add the constants for the callback result of SendCecCommand().
- Move the send failure warning messages into HdmiCecController.sendCommand()
  from each Actions.
- Stringfy with more detail messages for some opcodes.

Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
2014-05-26 11:35:09 +09:00
Craig Mautner
49a6e1b321 Merge "Modify task navigation to return to recent tasks. DO NOT MERGE" into lmp-preview-dev 2014-05-25 19:40:03 +00:00
Craig Mautner
0833d2bc87 Merge "Add code for persisting tasks and activities to disk DO NOT MERGE" into lmp-preview-dev 2014-05-25 19:39:47 +00:00
Philip Milne
3dc38c1b59 Merge "More on weights in GridLayout" 2014-05-25 04:13:25 +00:00
Philip Milne
dea890fa64 More on weights in GridLayout
Chance as little as possible from existing. If weights are defined only a
subset of the views in a layout (the normal case) leave the layout of the
remaining views unaffected.

Change-Id: I27473e303c0666930e2fb515b794df96a8b97272
2014-05-24 21:02:45 -07:00
Guang Zhu
82d96d5e21 Merge "Revert "Add physical TV input handling to TvInputManagerService"" 2014-05-24 19:03:02 +00:00
Guang Zhu
70aa0c6db3 Revert "Add physical TV input handling to TvInputManagerService"
Bug: 15197740

This reverts commit c8324a8e70d9f617c92f49e7c0b3e2484d9190fd.

Change-Id: Ie7b5405e929b5903f43188c3445fe9d24ecf92c2
2014-05-24 19:02:50 +00:00
Craig Mautner
e67a784eb2 Modify task navigation to return to recent tasks. DO NOT MERGE
Tasks launched from the recent task list will now return to the list
when they are finished. Also tasks that are launched from the
notification panel and services will now return to the list,
provided that the launcher is not front and center when they are
launched.

Fixes bug 14464114.

Change-Id: Ic0d3731fc7248d1eaa80e5ee399753d80e80c979
2014-05-24 09:50:37 -07:00
Craig Mautner
4d22b4a016 Merge "Modify task navigation to return to recent tasks." 2014-05-24 16:48:16 +00:00
Wonsik Kim
5d038b9d6f Merge "Add physical TV input handling to TvInputManagerService" 2014-05-24 15:13:47 +00:00
Philip Milne
4885f2f773 More on adding support for weights to GridLayout
Remove fields that are not needed with view-based allocation.

Change-Id: I23dc75fea47c532ad46e23b7fb14ff8e46c68db1
2014-05-24 06:14:27 +00:00
Philip Milne
9505480ee3 More on weighted space distribution in GridLayout
This CL changes the weight distribution algorithm to act on views rather
than rows/columns. This is a more general mechanism that is simpler to
define.

Change-Id: Ifa5adbe0b0a9a9ae271616321385f8e926aba054
2014-05-23 19:50:40 -07:00
Ruben Brunk
c371be303b Merge "camera2: Remove CameraAccessException throw for vendor tag setup." 2014-05-24 02:03:51 +00:00
Craig Mautner
df6523f270 Modify task navigation to return to recent tasks.
Tasks launched from the recent task list will now return to the list
when they are finished. Also tasks that are launched from the
notification panel and services will now return to the list,
provided that the launcher is not front and center when they are
launched.

Fixes bug 14464114.

Change-Id: Ic0d3731fc7248d1eaa80e5ee399753d80e80c979
2014-05-23 19:03:00 -07:00
Ruben Brunk
b6a781066e camera2: Remove CameraAccessException throw for vendor tag setup.
Bug: 15108304
Change-Id: Ieeb3f4b7b8bda9fc0ea1a3fc13be21668a0bbafd
2014-05-23 18:47:15 -07:00
Craig Mautner
21d24a21ea Add code for persisting tasks and activities to disk DO NOT MERGE
Recent tasks that have the persistable flag set are
saved to /data/system/recent_tasks/ on shutdown and in the
background. Their thumbnails are saved to
/data/system/recent_images/.

Change-Id: Ifb820a01c412fe1f8c0f6e41aa655fafd89eaa8d
2014-05-23 18:42:33 -07:00
Craig Mautner
dbcd3aa22a Merge "Improve DocCentric documentation." 2014-05-24 00:46:51 +00:00
Dianne Hackborn
b861179fca am b7a1d1e4: Merge "Fix issue #15195464: battery history says wakelock held when it\'s not" into lmp-preview-dev
* commit 'b7a1d1e4ed6ea26512d1e1f34fa264a639c91819':
  Fix issue #15195464: battery history says wakelock held when it's not
2014-05-24 00:38:08 +00:00
Dianne Hackborn
a82c9be2f7 Merge "Fix issue #15195464: battery history says wakelock held when it's not" into lmp-preview-dev 2014-05-24 00:35:55 +00:00
Ruben Brunk
94ecb5506a am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev
* commit 'a7c97c552a280ed3a2ff3535a5085f8601f45820':
  camera2: Move DngCreator to hardware/camera2.
2014-05-24 00:30:06 +00:00
Ruben Brunk
0bfa56e766 Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev 2014-05-24 00:25:59 +00:00
Alan Viverette
2449be1a73 am f0016cab: Merge "Revert small / medium / large text sizes" into lmp-preview-dev
* commit 'f0016cabf7ca8b23251e9e6044f6d5373e6d1bf2':
  Revert small / medium / large text sizes
2014-05-24 00:17:06 +00:00
Dianne Hackborn
536456f2d4 Fix issue #15195464: battery history says wakelock held when it's not
Simplify full wake lock logging, so wake_lock_in is a completely
separate event from wake_lock and provides the full real raw log
of wake lock events.

Also attempt to address issue #15018750 (Incorrect wakelock reporting)
by no longer being complicated and rolling up previous state in to a
new history slice.

Bug: 15195464
Bug: 15018750
Change-Id: I32154bdfc2f07113be969f9db5503b2f2807a427
2014-05-23 17:16:26 -07:00
Alan Viverette
13c8cdfb1d Merge "Revert small / medium / large text sizes" into lmp-preview-dev 2014-05-24 00:15:15 +00:00
Alan Viverette
c86917197a Revert small / medium / large text sizes
Also moves a few Quantum styles over to styles_quantum.xml.

BUG: 13769331
Change-Id: Ia83efacf98a2bd8a0f1e5783d34fac77ea1b5949
2014-05-23 17:07:04 -07:00
Chris Craik
cd3a824548 Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev 2014-05-23 23:21:49 +00:00
Christopher Tate
6000a6c663 Merge "Run the task manager service at startup" 2014-05-23 23:18:13 +00:00
Christopher Tate
8f64f80888 Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content.

Bug 14993295
Bug 14997851

Change-Id: I9b5738d026ea2526cdfbc96d0239c74687c51611
2014-05-23 16:07:45 -07:00
Zhijun He
2f6da3e739 am 0eb2fa3c: Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev
* commit '0eb2fa3cf88d037f645555e3a1c4644cdf0a67c9':
  Camera2: Mark the under-specified tags for FUTURE
2014-05-23 22:48:08 +00:00
Zhijun He
c1631fd890 Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 2014-05-23 22:44:33 +00:00
Craig Mautner
deec695253 Merge "Add code for persisting tasks and activities to disk" 2014-05-23 22:37:20 +00:00
Craig Mautner
2d74ce309f Improve DocCentric documentation.
Fixes bug 15025461.

Change-Id: I34cc13105072cf054f125a7963294165258fec0e
2014-05-23 15:34:48 -07:00
Alan Viverette
9c32f25eb6 am 106210a7: Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev
* commit '106210a703563cfb11c23ab80d8f29b990df7ec5':
  Handle hybrid themes correctly in Drawable cache
2014-05-23 22:33:51 +00:00
Alan Viverette
0b723fdbaa Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev 2014-05-23 22:30:42 +00:00
Alan Viverette
70929a3cb5 am 89425f4f: Merge "Fix selection handle offsets" into lmp-preview-dev
* commit '89425f4f4bc05f64988ca5fceb0fd5d2e370f499':
  Fix selection handle offsets
2014-05-23 21:56:46 +00:00
Alan Viverette
7a57c01aac Merge "Fix selection handle offsets" into lmp-preview-dev 2014-05-23 21:52:40 +00:00
Jae Seo
cd39dc783e Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev 2014-05-23 21:40:59 +00:00
John Reck
d04d303e5d resolved conflicts for merge of 1f6c973b to master
Change-Id: I0d0a72f1d737fa80ac4c258c1f9fc52ef85724bd
2014-05-23 13:56:35 -07:00
Zhijun He
8949225294 Camera2: Mark the under-specified tags for FUTURE
Also clean up the tag ids.

Bug: 15168075
Change-Id: I57fb6fb37e512c224370c72d806a4b702360f29f
2014-05-23 13:49:59 -07:00
John Reck
4967c18308 Merge "Bag of scheduling tweaks" into lmp-preview-dev 2014-05-23 20:43:36 +00:00
Alan Viverette
6ff38eea0b Fix selection handle offsets
BUG: 14313604
Change-Id: If8a1c60a90b89a94716c25abb3511c8612cbb973
2014-05-23 20:25:20 +00:00
Igor Murashkin
e48fb064ac am 31771fd6: Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev
* commit '31771fd63b8d08207012c4877a08679fa9b9d539':
  camera2: Refactor CameraMetadata.Key out into 3 key classes
2014-05-23 20:13:38 +00:00