136834 Commits

Author SHA1 Message Date
John Spurlock
bba3f86f22 Merge "Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." 2014-05-22 19:03:08 +00:00
Jae Seo
b138300a27 Merge "Add more columns to TV metadata to enable newly requested use cases" 2014-05-22 19:02:46 +00:00
vandwalle
559486f081 revert change preventing NULL SSID in a WifiConfiguration
bug: 15114340

Change-Id: Ic66363fc7781a1d65e5b8647843a752c048145a1
2014-05-22 11:54:44 -07:00
Lorenzo Colitti
9c1ccc54a5 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
2014-05-22 11:51:27 -07: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
John Spurlock
47e7b73958 Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
Hide notifications on the lockscreen if the setting = 0.

Bug:15104826
Change-Id: I394f10a9958a3ee4d03198f21eb09b778e00903e
2014-05-22 14:32:20 -04:00
Winson Chung
6784f1c623 Removing unnecessary public values. (Bug 14995844) 2014-05-22 11:22:41 -07:00
Sebastien Hertz
5973815f27 am 0f293905: am b2db356d: am fc1ffe89: Merge "Report runtime information to DDMS"
* commit '0f293905646713a5e603f75e3fa92f14e9e650d1':
  Report runtime information to DDMS
2014-05-22 18:01:16 +00:00
Vinod Krishnan
87224df175 Adding activity enter/exit animations for wearables
Bug: 14939877
Bug: 15022424

Change-Id: Id230066c675254a63c5222719a05f86c6b897fa5
2014-05-22 10:55:45 -07:00
Julia Reynolds
ae52657e5f Merge "Create deviceowner gated APIs for creating and removing users in devicepolicymanager." 2014-05-22 17:53:09 +00:00
Winson Chung
31d8b9333b Merge "Invalidating screenshots when we resume the task that they were taken in. (Bug 13587139)" 2014-05-22 17:46:58 +00:00
Dianne Hackborn
02a217fad0 Merge "Battery monitoring fixes:" 2014-05-22 17:22:15 +00:00
Ihab Awad
f25ec6370a Merge "Fix invalid format specifier in log message" 2014-05-22 17:17:20 +00:00
Victoria Lease
d0769f6981 Roboto v2
Fresh new revisions of our Roboto family of fonts, including family
aliases for sans-serif-medium and sans-serif-black. Enjoy!

Change-Id: I2337ccbd1767a7769deea885e0900f1ca4329779
2014-05-22 10:01:20 -07:00
Ihab Awad
9519ee7fb9 Fix invalid format specifier in log message
Bug: 15154713
Change-Id: Ia1f45eb568b31f02a7443def0dc9ef32a21e7f02
2014-05-22 09:49:34 -07:00
Dianne Hackborn
2d4b4ed681 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 09:43:18 -07:00
John Spurlock
3d0f8ebce8 Merge "Better wifi-enabled signal from network controller." 2014-05-22 16:23:09 +00:00
John Spurlock
a9cc0c035d Better wifi-enabled signal from network controller.
The old "is wifi enabled" signal was geared toward the cluster
view.  Since the clients of the callbacks are now only QS tiles,
make sure to plumb through the actual enabled value all the way
up to the tile.

Bug:15161053
Change-Id: I8b69c599f06d5b36e3f44dc666e1621840ffd927
2014-05-22 12:20:16 -04:00
Paul Jensen
985086276f Merge "Implement bind-to-network functionality of android.net.Network." 2014-05-22 16:14:21 +00:00
Nicolas Prevot
f0ee5a795a Merge "Correcting a bug related to Uri permissions." 2014-05-22 16:08:18 +00:00
Julia Reynolds
1e95839823 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
2014-05-22 12:02:23 -04:00
Nicolas Prevot
dcb27fadcd Correcting a bug related to Uri permissions.
Change-Id: I70765eb659151ce0c5af06075a844143c09429e8
2014-05-22 16:53:34 +01:00
Sebastien Hertz
0f29390564 am b2db356d: am fc1ffe89: Merge "Report runtime information to DDMS"
* commit 'b2db356dc8514e8b7546a04907217f02cd8b19e1':
  Report runtime information to DDMS
2014-05-22 14:57:28 +00:00
Sebastien Hertz
b2db356dc8 am fc1ffe89: Merge "Report runtime information to DDMS"
* commit 'fc1ffe89db4bfe51856dadead2ed9c856a96ca65':
  Report runtime information to DDMS
2014-05-22 14:53:22 +00:00
Yohann Roussel
7d66d76fbb Merge "Fix ANR in multidexlegacytestservices." 2014-05-22 14:52:03 +00:00
Sebastien Hertz
fc1ffe89db Merge "Report runtime information to DDMS" 2014-05-22 14:47:14 +00:00
The Android Automerger
b3442311e0 merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89 2014-05-22 07:22:04 -07:00
Christoph Studer
36a9acb7eb Merge "SysUI: Use SBN keys instead of IBinder keys" 2014-05-22 14:19:55 +00:00
George Mount
b284e30b40 Merge "fixed mIsReturning initialized too late." 2014-05-22 14:04:33 +00:00
Christoph Studer
540b01e024 SysUI: Use SBN keys instead of IBinder keys
In preparation of migrating to NotificationListenerService,
remove dependence on IBinder keys for notifications and switch
to SBN.getKey() instead.

Bug: 15131411
Change-Id: Ic272e4a05fde6481c734144c5b34c49b2f021649
2014-05-22 15:48:30 +02:00
Ruben Brunk
13ace57274 Merge "Javadoc fix." 2014-05-22 13:31:09 +00:00
Ruben Brunk
3e7fe434d0 Javadoc fix.
Change-Id: I4644ec782e636104fc06a27716f2fd224003e8d2
2014-05-22 06:30:16 -07:00
Robert Greenwalt
07fb5a884f Merge "Move dis/enable of mobile data to Telephony" 2014-05-22 13:22:35 +00:00
Adrian Roos
4d5bf5ee5e Merge "Only send notification activity intents after dismissing Keyguard" 2014-05-22 13:03:51 +00:00
Adrian Roos
995757e330 Merge "Remove dead TrustListeners" 2014-05-22 13:03:42 +00: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
Xiong Li
e88b042d1d Activity chooser "Always" button is not working
When ResolverActivity is created with a custom list of matching
applications (rList) as in NFC case, and the alwaysUseOption is
set to true, the prferredActivity is not saved even if the user
presses the "always" button.

When a list is provided the variable mBaseResolveList will be
!= null. This will set mOrigResolveList = null.

When an activity is choosen and one of the buttons are pressed
onIntentSelected is called. The first thing this method does
is to check mAdapter.mOrigResolveList != null, however in this
case mOrigResolveList is always null, and the value is not
saved as PreferredActivity.

This problem was introduced in
6d8dfbd8149942f25f2b9643a12f1fb38f3be834.

Change-Id: I9eac41b7861b5e68ad3978af0dc0285f2a34eb88
2014-05-22 11:58:41 +02: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
Sebastien Hertz
e901dbdee2 Report runtime information to DDMS
Reports runtime's ABI and internal flags to be displayed by DDMS.

Bug: 14888999
Bug: 14888124
Change-Id: I8a2d3f22f84a093be2fbc74464af6aa7b2a2bebb
2014-05-22 10:28:12 +02: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