136861 Commits

Author SHA1 Message Date
Aravind Akella
b5e3f4ea13 am c7153377: am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev
* commit 'c7153377cf03303e97185397544a13971a089961':
  Remove getRequiredPermission from NDK.
2014-05-23 18:04:18 +00:00
Nick Vaccaro
c9c88429a6 am 1af1371e: (-s ours) am 117df282: Don\'t grab wakelock if Wifi feature not supported on device
* commit '1af1371e1b3256b9405f6ef7d828297d152637ca':
  Don't grab wakelock if Wifi feature not supported on device
2014-05-23 18:04:13 +00:00
John Spurlock
244252af8b Merge "QuickSettings: Use connectivity manager for airplane mode." into lmp-preview-dev 2014-05-23 18:04:03 +00:00
Kenny Guy
1bdbd4be02 Add ability to uninstall per user to adb shell pm.
Default is still uninstall for all users, but if --user
is passed in it will just uninstall for that user.
For system apps if --user is supplied it will uninstall
rather than revert to the current system version.

Change-Id: If1be0f78f01391f7ac6b53150dfeeccd0c002899
2014-05-23 18:37:34 +01:00
Selim Cinek
67faeb30bf am 6547afc4: Merge changes I884b6830,Iee71e4eb into lmp-preview-dev
* commit '6547afc42bd74bb25d6f5a129e10bd225e3e61e9':
  The layertype was incorrectly restored with overlapping alpha animations.
  Decreased shadows between notifications slightly.
2014-05-23 17:36:28 +00:00
Alan Viverette
de220369c6 am e11794a2: Merge "Update switch, checkbox, radio button, button, and toggle button" into lmp-preview-dev
* commit 'e11794a2c1af70a265b6476ce3f3587814e9f0b3':
  Update switch, checkbox, radio button, button, and toggle button
2014-05-23 17:36:23 +00:00
Selim Cinek
b72b09cb5e Merge changes I884b6830,Iee71e4eb into lmp-preview-dev
* changes:
  The layertype was incorrectly restored with overlapping alpha animations.
  Decreased shadows between notifications slightly.
2014-05-23 17:33:23 +00:00
Alan Viverette
048aad39ba Merge "Update switch, checkbox, radio button, button, and toggle button" into lmp-preview-dev 2014-05-23 17:31:03 +00:00
Alan Viverette
fd6e411767 Add support for setColorFilter in VectorDrawable
Also cleans up inflation so that we can apply themes more easily.

Change-Id: I56decb29fe987286a38fc0aa96f95952cf67c120
2014-05-23 10:29:37 -07:00
John Spurlock
6627ff6d9d QuickSettings: Use connectivity manager for airplane mode.
Bug:15187219
Change-Id: I8455d062a9d974a464abff3c656ca18d6da3fe9d
2014-05-23 12:59:27 -04:00
Winson Chung
376543bc5f DO NOT MERGE
Invalidating screenshots when we resume the task that they were taken in. (Bug 13587139)

- Removing multiple calls to get the same thumbnail screenshot
(cherry picked from commit d4ce870e9ad24eff444443bd19ca2061f7c3099d)

Change-Id: Id1feea856a1374173c7f0d329d6f11482794df1a
2014-05-23 16:58:15 +00:00
Jaewan Kim
450cd7ff3e am 70246e34: Merge "Fix Ethernet documentation." into lmp-preview-dev
* commit '70246e348a81b8e0e3944ba5d67f4e2b138d6814':
  Fix Ethernet documentation.
2014-05-23 16:53:39 +00:00
Jaewan Kim
a06d76b139 Merge "Fix Ethernet documentation." into lmp-preview-dev 2014-05-23 16:48:16 +00:00
Yuhao Zheng
b97070903d Merge "Update Hotspot 2.0 SDK APIs" 2014-05-23 16:44:07 +00:00
Kenny Guy
759c9b9688 Merge "Fix bug with removeUser assuming it is called from system uid." 2014-05-23 16:27:35 +00:00
Yuhao Zheng
bd9af35597 Update Hotspot 2.0 SDK APIs
Change-Id: I0528b378219e03f896497127b5c4b191bf014141
2014-05-23 09:25:45 -07:00
Derek Sollenberger
c33fb2b5c0 Merge "Pass the radius as a float deeper into HWUI allowing RS to generate more accurate blurs." 2014-05-23 15:51:20 +00:00
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
c250d06a81 am b19a6293: QS: Reset user activity timeout on the lockscreen.
* commit 'b19a6293d0e893327553dbe1a0d03953f7b70508':
  QS: Reset user activity timeout on the lockscreen.
2014-05-23 15:25:39 +00: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
Kenny Guy
ee58b4f44d Fix bug with removeUser assuming it is called from system uid.
This causes adb shell pm remove-user to fail.

Bug: 15160176
Change-Id: If1ff61dbde90f930d32affd87f935b318df813df
2014-05-23 15:23:52 +01:00
Chris Wren
27692098d7 am 8a0322c5: Fix a concurrency bug in the ranking reconsideration.
* commit '8a0322c5887bb277ce21adeceb65c287d81d7d79':
  Fix a concurrency bug in the ranking reconsideration.
2014-05-23 13:55:58 +00: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
Chris Wren
e3dd9118a2 Merge "Fix a concurrency bug in the ranking reconsideration." 2014-05-23 13:44:55 +00:00
Chris Wren
4ad99682dd 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
2014-05-23 09:36:09 -04:00
Julia Reynolds
9ad7ed466f am f98b8c9b: Merge "Create deviceowner gated APIs for creating and removing users in devicepolicymanager." into lmp-preview-dev
* commit 'f98b8c9b8118685120de8e97c13bd15a8f56fc64':
  Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
2014-05-23 13:13:06 +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
Adrian Roos
f176e3be88 am fe3a59cf: Merge "Add a cache to LockPatternUtils" into lmp-preview-dev
* commit 'fe3a59cfa476fd22006f585b1c5ae8624d5191df':
  Add a cache to LockPatternUtils
2014-05-23 13:04:10 +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
Yohann Roussel
3d736bc13c A test application for Art bug 14256107
Change-Id: I629e8d0f91af6a6aff5a6d3f0b584fc01ba4429e
2014-05-23 14:55:35 +02:00
Selim Cinek
215e25f2da am 739b38cb: Merge "Improved the animation logic of the stack scroller." into lmp-preview-dev
* commit '739b38cb6fd8cc192686f0fbac6de270dd83e479':
  Improved the animation logic of the stack scroller.
2014-05-23 12:53:52 +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
Nicolas Prevot
8194899071 Rename code related to cross-profile intents.
For example, replace ForwardingIntentFilter by CrossProfileIntentFilter

Bug: 15023443

Change-Id: Iee8cdf578817ef9956bcdece803a49b0d07b67f7
2014-05-23 13:16:01 +01: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
94d76b3ba9 am 596ce060: Merge "SysUI: Implement NotificationListenerService in StatusBar" into lmp-preview-dev
* commit '596ce060988d869ed5d6ac0f25cad79d9ab4fba6':
  SysUI: Implement NotificationListenerService in StatusBar
2014-05-23 10:16:36 +00:00
Christoph Studer
ab17ddf66f am 44ff0d4e: Merge "NoMan: Allow SysUI to register as listener" into lmp-preview-dev
* commit '44ff0d4e5b59b15788f9b5ad01ef82b59237c8a7':
  NoMan: Allow SysUI to register as listener
2014-05-23 10:16:31 +00:00
Christoph Studer
6c89347ffa am 5dd2c2cc: (-s ours) Merge "SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE" into lmp-preview-dev
* commit '5dd2c2ccf61d582472588163ca062081e6068986':
  SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE
2014-05-23 10:16:26 +00:00
Zhijun He
500c2341d3 am 02d13364: Camera2: Add croppingType tag
* commit '02d133644511dbc14deb833c05713a531100e5d4':
  Camera2: Add croppingType tag
2014-05-23 10:16:20 +00: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
Yohei Yukawa
6c8ca8473a Merge "Consolidate the language-switching logic" 2014-05-23 09:15:16 +00:00
Yohei Yukawa
9b29d04565 Consolidate the language-switching logic
This CL does not change the existing behavior.
In I84291fd4a7d6192b, the IME rotation group is logically
devided into two groups, one is for IMEs that are declared as
supportsSwitchingToNextInputMethod == true, and the other is
IMEs that are not declared so. The problem is that the logic
was implemented with a single ime/subtype list where these two
kinds of IMEs are completely mixed. This makes the code
unnecessarily complex.
With this CL, these two rotation groups are actually managed
as two different collections separately. This allows us to
simplify the rotation logic as well as its test cases.
This CL is also a groundwork to implement smarter
language-switching logic that is applied to
language-switching-aware IMEs only.

BUG: 7043015
Change-Id: I7f08ec299ec41d614e2cd3912320687db1576e80
2014-05-23 18:02:42 +09:00
Griff Hazen
1e5746c682 am 00389a46: Fix build: CheckBuild line for removed wearable package
* commit '00389a46ea6c9d1a9557fe648ffec64aaf5e95e0':
  Fix build: CheckBuild line for removed wearable package
2014-05-23 08:37:01 +00:00