Commit Graph

5557 Commits

Author SHA1 Message Date
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
John Reck
d04d303e5d resolved conflicts for merge of 1f6c973b to master
Change-Id: I0d0a72f1d737fa80ac4c258c1f9fc52ef85724bd
2014-05-23 13:56:35 -07:00
John Reck
a5dda645da Bag of scheduling tweaks
Bug: 15118640

 * Prevent over-stuffing the queue by dropping frames
 * Prevent double-drawing in one pulse by RT by deferring
   vsync registration until post-draw so that it catches
   the next vsync pulse instead of the current one
 * Bias vsync race condition towards the UI thread
 * Fix queueDelay to actually work

Change-Id: Ibf584258bd93ebcbba058bd976dc8b307f1c6155
2014-05-23 12:56:38 -07:00
Michael Wright
2a89b08eb1 Merge "Add ability to request unbuffered dispatching." 2014-05-23 00:40:12 +00:00
Chris Craik
d490aa4260 Merge "Inspect SkShader to determine hw shader." 2014-05-23 00:03:46 +00:00
Leon Scroggins III
d1ad5e62fd Inspect SkShader to determine hw shader.
Instead of duplicating internal info about SkShader, inspect the
SkShader installed on the SkPaint.

core/java/android/view/GLES20Canvas.java:
Remove setupModifiers, nResetModifiers, and nSetupShader.

core/jni/android/graphics/Shader.cpp:
Remove calls to create/destroy the (previously) attached SkiaShader.

core/jni/android_view_GLES20Canvas.cpp:
Remove native code for setupShader and resetModifiers.

graphics/java/android/graphics/BitmapShader.java:
graphics/java/android/graphics/ComposeShader.java:
graphics/java/android/graphics/LinearGradient.java:
graphics/java/android/graphics/RadialGradient.java:
graphics/java/android/graphics/Shader.java:
graphics/java/android/graphics/SweepGradient.java:
Remove code keeping track of native SkiaShader.

libs/hwui/Caches.h:
Include Extensions.h.

libs/hwui/DeferredDisplayList.cpp:
Compare shaders on the paint, instead of on DrawModifiers.

libs/hwui/DisplayList.cpp:
libs/hwui/DisplayList.h:
Remove vector of SkiaShaders.

libs/hwui/DisplayListOp.h:
Access the SkShader on mPaint.
Remove SetupShaderOp and ResetShaderOp.

libs/hwui/DisplayListRenderer.cpp:
libs/hwui/DisplayListRenderer.h:
Remove resetShader, setupShader, refShader, and mShaderMap.

libs/hwui/FontRenderer.cpp:
Pass SkShader to setupDrawShader and setupDrawShaderUniforms.

libs/hwui/OpenGLRenderer.cpp:
libs/hwui/OpenGLRenderer.h:
Add LayerShader, a class inheriting from SkShader, to mimic the
behavior of SkiaLayerShader. Unlike SkiaLayerShader, it can be set on
the SkPaint so it can be inspected later.
Set a LayerShader instead of a SkiaLayerShader.
setupDrawShader and setupDrawShaderUniforms now inspect an SkShader
passed in.
Inspect SkShader instead of mDrawModifiers.mShader.
Remove resetShader and setupShader.
setupDrawColorUniforms now takes a boolean indicating whether there is
a shader.
Add an inline function for accessing the SkShader on an SkPaint.
In setupDrawBlending(Layer*, bool), do not check the shader (which will
never be set), but do check whether the color filter may change the
alpha (newly fixed behavior).
In setupDrawBlending(SkPaint, ...), check the SkShader and whether the
color filter affects alpha (the latter is new behavior).

libs/hwui/Renderer.h:
Remove pure virtual functions setupShader and resetShader.

libs/hwui/ResourceCache.cpp:
libs/hwui/ResourceCache.h:
Remove functions for refing/unrefing shaders.

libs/hwui/SkiaShader.cpp:
libs/hwui/SkiaShader.h:
Much of this code was redundant and has been removed.
Convert structs into class with nothing but static functions for
calling describe/setupProgram.

libs/hwui/TextureCache.cpp:
libs/hwui/TextureCache.h:
Use the SkPixelRef as the key to the bitmap Lru cache, since shader
inspection will provide a different SkBitmap pointer (though it will
hold the correct SkPixelRef with the correct generation ID).

tests/CanvasCompare/src/com/android/test/hwuicompare/DisplayModifier.java:
tests/CanvasCompare/src/com/android/test/hwuicompare/ResourceModifiers.java:
Update manual test to have more shaders: radial, sweep, compose,
invalid compose.

BUG:10650594

Change-Id: Iaa7189178bda1c55f96da044d2a9fa602ba36034
2014-05-22 14:46:59 -04:00
Chris Craik
b8fe2fcd71 Merge "Define light position (using new lighting spec) in Java" 2014-05-22 00:18:21 +00:00
Svetoslav
5c4cd189f2 Fixing bugs due to the new custom accessibility action APIs.
1. AccessibiltiyAction was incorectly throwing an exception when
   a custom action was constructed.

2. AccessibilityManagerService should no longer enforce only standard
   actions as we allow custom ones too.

bug:15110963

Change-Id: Iea57e0a6449b87bd8d103c55ca255e80705f2565
2014-05-21 14:53:25 -07:00
Chris Craik
797b95b26b Define light position (using new lighting spec) in Java
Also updates the relative shadow strengths.

Change-Id: I6cac7275d38df98aea9f0dda463cd7207102986a
2014-05-21 13:50:29 -07:00
John Spurlock
3346a80208 VolumeZen: SystemUI now hosts the volume dialog.
- Allow SystemUI to set the volume controller interface using
  a new binder call to audio service.
- Remove VolumePanel's dependency on AudioService.
- Host the base VolumePanel in the SystemUI process.

Change-Id: I095d5a1a579d42b68d0f81abb4087bd0c754b876
2014-05-21 09:58:41 -04:00
Kristian Monsen
7a8e6e59ab Merge "Consider addAction(int action) to possibly be a bit mask" 2014-05-21 00:42:20 +00:00
Kristian Monsen
8d5f3fa645 Consider addAction(int action) to possibly be a bit mask
bug=15092606

Change-Id: I885808b3f4d2337129d1660300be8e926f8a8425
2014-05-20 16:44:14 -07:00
Chris Craik
47a7d61e70 Merge "Clean up Outline API, method on drawable" 2014-05-20 23:27:21 +00:00
Chris Craik
7dc5b41e60 Clean up Outline API, method on drawable
bug:15025466
bug:15089680
Change-Id: I8d3b64a0d9dbdbaf679042c8b384d2050323a8e6
2014-05-20 10:38:59 -07:00
John Reck
1fcc3b1896 Merge "Baby steps" 2014-05-20 14:10:53 +00:00
Jinsuk Kim
96658f7167 New keycode definitions for HDMI-CEC
Following keys are added to be mapped to HDMI-CEC standard keys:

KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE

Also updated the information on the key code update by removing
some files not present any more.

Change-Id: I305d9b578c1824f34c457144a68132717dc9a97f
2014-05-20 00:43:38 +00:00
Alan Viverette
c80ad99a33 TouchFeedbackDrawable is now RippleDrawable
Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
2014-05-19 16:27:31 -07:00
John Reck
918988c1ce Baby steps
Run ViewPropertyAnimators with no listeners on the RenderThread

Change-Id: I7ff5300db96c7f4b59b09e3fff8a0df173f132dd
2014-05-19 15:28:05 -07:00
John Reck
86faf9ec3e Workaround double-translate bug
Bug: 15065005

Change-Id: Ie0f77c6ea13eebf3508df7513b79efaa65d31de0
2014-05-19 13:19:07 -07:00
Alan Viverette
677a9f2496 Merge "Fix onHardwarePreDraw call in ThreadedRenderer" 2014-05-17 23:37:42 +00:00
Alan Viverette
d5b2ec4ff1 Fix onHardwarePreDraw call in ThreadedRenderer
Change-Id: Ia3852cbd7afc21e9f57824e9f207ba02acae12a7
2014-05-17 16:34:09 -07:00
Michael Wright
d27a69c40d Merge "Add InputStage debugging logs" 2014-05-17 00:44:35 +00:00
Michael Wright
9d744c7312 Add ability to request unbuffered dispatching.
While in general input batching has a lot of benefits, some apps would prefer
the input system not batch at all. This is typically because they do some of
the batching as part of their own input processing, as is the case with Chrome.

Bug: 12973909
Change-Id: I2e0c2b4c51bacc06f88245c528aa8849e4c4dab2
2014-05-16 15:59:53 -07:00
Tim Kilbourn
87cd0dc425 Add KEYCODE_PAIRING.
Used for initiating a peripheral pairing mode.

Change-Id: I8e172bdda1f3c34eff36f3001c174f7a6b6e6e41
2014-05-16 15:14:53 -07:00
John Reck
4b300d7dcb Merge "Add missing fence()" 2014-05-16 21:47:33 +00:00
John Reck
44ac42a6c9 Add missing fence()
Bug: 14995924

Change-Id: I991fe74f01468b1b7e34aee0455dc419637f5c8d
2014-05-16 14:46:07 -07:00
Alan Viverette
ad2f8e334f Update ripple behavior, use render thread animation
Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
2014-05-16 13:28:33 -07:00
John Reck
6d6ce03a03 resolved conflicts for merge of 313c5f38 to master
Conflicts:
	core/java/android/view/HardwareRenderer.java

Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd
2014-05-16 10:38:14 -07:00
John Reck
313c5f38e8 am f18aed83: am 0661ddee: Merge "Enable display list updates with zero delta time"
* commit 'f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
  Enable display list updates with zero delta time
2014-05-16 16:00:09 +00:00
John Reck
f18aed83f6 am 0661ddee: Merge "Enable display list updates with zero delta time"
* commit '0661ddee112477db180d65e605f34fd538fdf8bc':
  Enable display list updates with zero delta time
2014-05-16 15:56:07 +00:00
Chris Craik
c9ee304c91 Merge "Round rect outline clipping" 2014-05-16 00:37:29 +00:00
Chris Craik
deeda3d337 Round rect outline clipping
Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
2014-05-15 16:36:12 -07:00
Adrian Roos
e78e6f9237 Merge "Colorize SystemUI" 2014-05-15 20:39:17 +00:00
Adrian Roos
e71c2af2a1 Merge "Add System UI Color API" 2014-05-15 20:37:50 +00:00
John Reck
a3d5d3ca11 Merge "Animator start value..." 2014-05-15 20:10:52 +00:00
Svetoslav Ganov
177cf2155d Merge "Adding custom events to AccessibilityNodeInfo" 2014-05-15 17:51:46 +00:00
Kristian Monsen
74bc194765 Adding custom events to AccessibilityNodeInfo
Change-Id: Id7a1985d1a6c4a9f7153f6d4d7e45f80c8d2b2b0
2014-05-15 10:50:59 -07:00
Adrian Roos
ea56251d92 Colorize SystemUI
Makes the color of the status and navigation bars customizable by
the app.

Bug: 14564488
Change-Id: I036edc228cfe1b659c7f11a43cdc4598ee705ff8
2014-05-15 18:22:37 +02:00
Adrian Roos
217ccd2f82 Add System UI Color API
Bug: 14564488
Change-Id: Ibebe87faeb1b730f9ac33bb5074a7b4f71b9d1c7
2014-05-15 18:22:37 +02:00
John Reck
ff941dcd81 Animator start value...
Change-Id: Ifd35ed95a28c625086d7fa97764fe63ab4a997f1
2014-05-15 08:53:39 -07:00
George Mount
45bbc06c7c Merge "Support Activity Transitions when activity stopped." 2014-05-15 14:49:56 +00:00
George Mount
62ab9b78b7 Support Activity Transitions when activity stopped.
Bug 14459812
Bug 14454812
Bug 14450295

A new transport was supported for Activity Transitions
in which convertToTranslucent can now take a Bundle
to transport to the calling Activity. This also allows
waking Activities to regain the communication between
the exiting Activity and the calling Activity.

Change-Id: I29aee14b7e56d9b8b9fb656f382b2c4172b02e14
2014-05-15 07:11:48 -07:00
Yohei Yukawa
ed1a18f40f Merge "Make a copy of Matrix in CursorAnchorInfoBuilder" 2014-05-15 07:30:00 +00:00
Yohei Yukawa
419b1b0498 Make a copy of Matrix in CursorAnchorInfoBuilder
This CL fixes a bug that CursorAnchorInfoBuilder does't make a
copy if the Matrix specified with #setMatrix.

Without this fix, IMM#updateCursorAnchorInfo could fail to detect
duplicated events when the same instances of
CursorAnchorInfoBuilder and Matrix are reused to optimize
performance.

Change-Id: I50c50a12a06d3cda4dec445b171b61ceb78da21a
2014-05-15 16:10:04 +09:00
Raph Levien
2836c4722a Merge "Start of Minikin integration" 2014-05-15 02:03:05 +00:00
Yohei Yukawa
9edfec8b45 Merge "Enable CursorAnchorInfo to contain composing string" 2014-05-15 01:32:12 +00:00
Tina Zhang
cf85d6ee0f Enable display list updates with zero delta time
It's better not to cancel display lists updates. In the emulator, if we use
low precision clock source like refined-jiffies, the display list which
should be updated with a new frame, won't be updated due to the delta time
is 0 . And this makes all the hardware accelerated GUI out of order.

Change-Id: I41dba8965c96b6ad1b6d326ad1d6fa4a0a49173f
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
2014-05-15 08:41:24 +08:00
Michael Wright
06a7925a2e Add InputStage debugging logs
Change-Id: I0cd606b0c43ec9ab34f006b750e77bc312f66439
2014-05-14 13:32:58 -07:00
Michael Wright
92ddeeab47 Merge "Remove reflection from InputEventConsistencyVerifier ctor." 2014-05-14 19:50:49 +00:00
Michael Wright
fa28b98447 Merge "Only translate prefixed strings to keys / axes." 2014-05-14 19:43:16 +00:00