136719 Commits

Author SHA1 Message Date
Leon Scroggins III
0fa2bd699a DO NOT MERGE Inspect SkShader to determine hw shader.
cherry-pick of Iaa7189178bda1c55f96da044d2a9fa602ba36034

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: I2e7182b3fc28268e7ca82fac6780540b6b45365c
2014-05-23 11:50:38 -04:00
Selim Cinek
1efb240c1a The layertype was incorrectly restored with overlapping alpha animations.
This could lead to weird clipping bugs on the lockscreen. We now simply
set its type to back to NONE after the animation.

Bug: 15186220
Change-Id: I884b6830d748309105ed62471cb8b6dee71d51fe
2014-05-23 17:33:00 +02:00
John Spurlock
d08f91fa67 QS: Reset user activity timeout on the lockscreen.
If the quick settings panel changes, call userActivity to
delay the screen timeout.

Bug:15166195
Change-Id: Ie32fb39c5a975d9cf0d80d7fdf711177028a6b5c
2014-05-23 11:03:05 -04:00
Chris Wren
470c1accf5 Fix a concurrency bug in the ranking reconsideration.
If we rely on mNotificationList to be sorted, then we cannot allow
records to change without a corresponding call to sort.  Currently
RankingFuture may modify records in a separate thread, while the sort
doesn't happen until later.  This creates a window for race conditions.

Instead, RankingFuture should record operations to be performed on the
record that will replayed later, in a transaction along with a sort.

We can't simply overwrite the old record completely because another
future may be concurrently modifying a different aspect of the record.
Two futures that attempt to modify the same aspect will be serialized
and the second will overwrite eventually the first.

Change-Id: I9223cabdc60f72d8e37e6d8119bea1e0127185c0
(cherry picked from commit 77d3e0d0297caca5358879d36e8ba77710eb8e82)
2014-05-23 13:47:01 +00:00
Julia Reynolds
0e1dc0f5aa Merge "Create deviceowner gated APIs for creating and removing users in devicepolicymanager." into lmp-preview-dev 2014-05-23 13:08:09 +00:00
Selim Cinek
72b6f4d4d9 Decreased shadows between notifications slightly.
Bug: 15181880
Change-Id: Iee71e4ebf95df044b7bbdd3044cb69455d704150
2014-05-23 14:59:51 +02:00
Adrian Roos
98157e8dbb Merge "Add a cache to LockPatternUtils" into lmp-preview-dev 2014-05-23 12:58:19 +00:00
Selim Cinek
8a4729d871 Merge "Improved the animation logic of the stack scroller." into lmp-preview-dev 2014-05-23 12:50:30 +00:00
Selim Cinek
8efa6dde2b Improved the animation logic of the stack scroller.
Newly introduced appear and disappear animations when in the shade.
Also introduced individual child delays such that notifications
appear in a slightly more appealing quantum way.
Also fixed a racecondition, such that added notifications already
have their final visibility state when they are added to the scroller.

Bug: 14081264
Change-Id: I18f5c57c2206f8e05996253981f540e97521e102
2014-05-23 14:43:17 +02:00
Adrian Roos
818301b543 Remove unnecessary layout request from Keyguard
Reverts the fix for 7137389 that does no longer apply after
the architectural change of Keyguard and SystemUI.

Bug: 15088101
Change-Id: Ic9234a9e69363b65b6e121eab498cb8d74660c91
2014-05-23 14:38:34 +02:00
Adrian Roos
4f7884542c Add a cache to LockPatternUtils
Caches responses from LockSettingsService in the client process.

Bug: 15088101
Change-Id: If77c5ec45f52a02c800d50cb8550bfcb180f301d
2014-05-23 14:38:33 +02:00
Julia Reynolds
6cbbe9ec99 Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
This will allow DMAgent to manage users for EDU's cart model user case.
Bug: 15015887

Change-Id: I1eadf1701cb75fc4b50eb1a0df1525eff818286e
(cherry picked from commit be9f43b9618ec25121b151d247eb0285fb6554b3)
2014-05-23 11:14:34 +00:00
Adrian Roos
3ef2a7cbc3 Update open lock icon with actual assets from UX
Bug: 14295559
Change-Id: Ia9f94688a8776517e964bf7c84d71575d0ef985c
2014-05-23 12:36:06 +02:00
Christoph Studer
d57f8fc42d Merge "SysUI: Implement NotificationListenerService in StatusBar" into lmp-preview-dev 2014-05-23 09:22:34 +00:00
Christoph Studer
00b206e39b Merge "NoMan: Allow SysUI to register as listener" into lmp-preview-dev 2014-05-23 09:21:49 +00:00
Christoph Studer
0cc609606a Merge "SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE" into lmp-preview-dev 2014-05-23 09:21:13 +00:00
Lorenzo Colitti
bd8a374016 Fix Ethernet documentation.
1. Remove incorrect @return tag for void function.
2. Fix build breakage by removing the reference to
   #ETHERNET_SERVICE, which is hidden.

Change-Id: Ia893464bafc8257e48e0bd710d27954b535fcece
(cherry picked from commit ff7e406df8a46256e47fff70abc9116ad3f94c23)
2014-05-23 06:30:24 +00:00
Alan Viverette
2356c5e69b Update switch, checkbox, radio button, button, and toggle button
Add optical inset support to BitmapDrawable with gravity. Fix optical
inset support in DrawableContainer. Fix visibility change support in
AnimatedStateListDrawable. Adds a whole bunch of missing drawable
support to CheckedTextView.

BUG: 15127013
BUG: 15126976
BUG: 15125529
BUG: 15025806
BUG: 14597955
BUG: 14594498
BUG: 15152746
Change-Id: Id2d99e10838d25b6f927ca1e49996c8da8e78ab1
2014-05-22 22:43:59 -07:00
Zhijun He
1498615d56 Camera2: Add croppingType tag
This is to indicate if the camera supports arbitrary cropping.

Bug: 15168075
Change-Id: Ib75f7af629be816229cc686c89980fec101301c0
2014-05-22 21:58:48 -07:00
Alan Viverette
75257cefcd Handle hybrid themes correctly in Drawable cache
BUG: 15155868
Change-Id: I00326e6000027c2dae5305e816c80883119449c0
2014-05-22 19:31:38 -07:00
Christopher Tate
d9a6475c9c DO NOT MERGE - Don't crash uninstalling updates to system apps
Bug 15167960

Cherrypick from master

Change-Id: Ibcb3275adb27b20939a237511aaaa8b0011127e1
2014-05-22 19:03:01 -07:00
Zhijun He
2ecba24c48 Merge "Camera2: Raw is not croppable" into lmp-preview-dev 2014-05-23 00:42:14 +00:00
Zhijun He
6eb03e10b4 Merge "Camera2: Clarify shading map spec" into lmp-preview-dev 2014-05-23 00:35:58 +00:00
Zhijun He
9e6d1880c2 Camera2: Raw is not croppable
Update spec doc to clarify that raw stream is not croppable.

Bug: 15168075
Change-Id: I4ffa8e2a06acd17913426ba37744bb9df1bc7330
2014-05-22 16:47:35 -07:00
Dianne Hackborn
caa3abd3d1 Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev 2014-05-22 23:44:12 +00:00
Dianne Hackborn
2932513181 (DO NOT MERGE) Battery monitoring fixes:
- Improve monitoring of level changes to not be confused
  when it goes up while draining or down while charging.
- Put back in connectivity service code to tell battery
  stats about the interfaces.
- Turn back on reporting of mobile radio active state
  from the RIL.
- Fix bug in marshalling/unmarshalling that would cause
  the UI to show bad data.

Change-Id: I733ef52702894cca81a0813eccdfc1023e546fce
2014-05-22 16:43:17 -07:00
Zhijun He
fa7c755a92 Camera2: Clarify shading map spec
The existing spec is unclear about shading map calculation for both application
developer and hal implementers, need more clarification.

Also fix a typo in tonemap.mode.

Bug: 15168075
Change-Id: I7f38ccf6aa6938fdac9f64e95deddc0188025d08
2014-05-22 16:36:02 -07:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
2014-05-22 22:57:11 +00:00
Christoph Studer
60748e7122 SysUI: Implement NotificationListenerService in StatusBar
This is currently disabled by constant that is off.

Bug: 15131411
Change-Id: I0da6e5b3b81c87004f0794d3056c4cf0ecbb1d61
2014-05-22 22:51:15 +00:00
Eino-Ville Talvala
88aca033ff Merge "Camera2: New capture session interface" into lmp-preview-dev 2014-05-22 21:56:55 +00:00
Christoph Studer
3e144d3dfc NoMan: Allow SysUI to register as listener
Expand ACL of INotificationManger.registerListener() from
system only to system or SysUI.

Also call onListenerConnected() on listeners connected via
INotificationManger.registerListener().

Bug: 15131411
Change-Id: I8f2ce34325ad72c7740b383de2ebb9fb88dea5d3
2014-05-22 23:45:07 +02:00
Jorim Jaggi
7d16bb1e32 DO NOT MERGE Move clock and top padding while dismissing Keyguard.
Such translation. Much alpha. Very parallax. Wow.

Bug: 15163546
Change-Id: Id419acced94083cf6cd7abebbcf1d5a08439b0a7
(cherry picked from commit c42bdc3ba9493efe68b9ed39fbd55c84ba175185)
2014-05-22 21:43:46 +00:00
Christoph Studer
71f18fd1b6 SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE
In preparation of migrating to NotificationListenerService,
remove dependence on IBinder keys for notifications and switch
to SBN.getKey() instead.

Bug: 15131411
Change-Id: Ic272e4a05fde6481c734144c5b34c49b2f021649
(cherry picked from commit 7c96ae873d9a54ebaeb5b7ef21b48224dc42d094)
2014-05-22 21:41:13 +00:00
Eino-Ville Talvala
cca00c614c Camera2: New capture session interface
- Add CameraCaptureSession for all operations that require a
  valid camera configuration
- Deprecate methods in CameraDevice that are moving to CameraCaptureSession
- Document new semantics

Bug: 14964443
Change-Id: I53b2b71ed2b746cfcf76a01483f499765eb5047b
2014-05-22 20:52:36 +00:00
Jae Seo
7752244e47 DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases
Added the following columns to the Channels table:
 searchable - Used to hide certain channels from search.
 locked - Used to prevent unauthorized users from watching certain
          channels by requiring passcode.

Added the following columns to the Programs table:
 genre - Used to describe the categorical genre.
 audio_language - Used to list up available audio languages.

Bug: 14833588, Bug: 14123945, Bug: 14069779
Change-Id: Id01483f56ecf3b665e3d4dbcea1a4800ff7f031d
(cherry picked from commit 3532899452d62b6f2cd9250cb48ec204862fb3b2)
2014-05-22 20:46:48 +00:00
Ihab Awad
42b30e1b83 DO NOT MERGE. Fix invalid format specifier in log message
Bug: 15154713
Change-Id: Ia1f45eb568b31f02a7443def0dc9ef32a21e7f02
(cherry picked from commit 8523607b6e4927d034e47681174843f22308e34a)
2014-05-22 20:36:16 +00:00
The Android Automerger
b3442311e0 merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89 2014-05-22 07:22:04 -07:00
The Android Automerger
52c78c839a merge in master-release history after reset to 8b8f98b68792a4b5c1650d67d0aa953a7f10aab0 2014-05-22 05:50:24 -07:00
Jorim Jaggi
aa7707ddc4 Merge "Fix weird state with QS expansion." 2014-05-22 12:27:51 +00:00
Jorim Jaggi
9cd731a013 Fix weird state with QS expansion.
Bug: 15147023
Change-Id: Ief32ee756e22b330e0fb63b0dab64aa83ffb9124
2014-05-22 14:26:06 +02:00
Christoph Studer
08a7b76441 Move more packages to framework2
Change-Id: Ib8e3c915479eb5bc029256934d522f3714071bc2
2014-05-22 14:22:26 +02:00
Yohei Yukawa
4fae8e165b Merge "Remove unnecessary internal lock" 2014-05-22 11:07:14 +00:00
Yohei Yukawa
5a647b69be Remove unnecessary internal lock
Previously, InputMethodSubtypeSwitchingController has relied on
its own internal lock for #getNextInputMethod and
class has to be invalidated whenever
InputMethodManagerService#mMethodMap is updated, any method of
InputMethodSubtypeSwitchingController should be called under
the global lock of InputMethodManagerService#mMethodMap.

As a consequence, we can conclude that
InputMethodSubtypeSwitchingController does not need its own
internal lock.

This CL also adds additional synchronization blocks into
the constructor of InputMethodManagerService to address the
existing inconsistency that methods with *Locked suffix are
called without the lock actually.

BUG: 7043015
Change-Id: I9d4d3d7232c984432185c10c13fb726a6158cac8
2014-05-22 18:18:02 +09:00
Yohei Yukawa
350c73fb40 Merge "Overrides ImeSubtypeListItem#toString" 2014-05-22 08:21:21 +00:00
Yohei Yukawa
1c63079b55 Overrides ImeSubtypeListItem#toString
This makes it easy to debug.

BUG: 7043015
Change-Id: Ic389fc20d417c01196e06046f5259ad56a7aca6c
2014-05-22 16:15:35 +09:00
Alan Viverette
840ff4ae5b Merge "End-align alert dialog buttons to avoid layout bug on tablet" 2014-05-22 06:51:27 +00:00
Alan Viverette
db2ed8fdd1 Merge "Move setTint into Drawable, unhide getDirtyBounds on Drawable" 2014-05-22 06:51:10 +00:00
Alan Viverette
e7772d313b Move setTint into Drawable, unhide getDirtyBounds on Drawable
BUG: 15089957
Change-Id: Ib622ba24b3f4bcf430e1d524895ac5cb104a232e
2014-05-21 23:50:03 -07:00
Ruben Brunk
94520c7460 Merge "camera2: Add HAL1 compatibility shim skeleton." 2014-05-22 06:08:56 +00:00
Lorenzo Colitti
521d8cdae0 Merge "Make the EthernetManager available." 2014-05-22 05:55:56 +00:00