136720 Commits

Author SHA1 Message Date
Griff Hazen
6b7b34849a Merge commit 'e5b73ae2' into manualmerge
Conflicts:
	api/current.txt
	core/java/android/app/Notification.java

Change-Id: I3141ed6b456107b7e5aa8c0c9c98ffc1d77fdf75
2014-05-22 16:05:19 -07:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
2014-05-22 22:57:11 +00:00
Jeff Sharkey
78cc340c2d Offer to stream and fsync() install sessions.
Installers are interested in both streaming APK data and establishing
a happens-after relationship to support resuming downloads after a
process kill or battery pull.

This exposes a generic OutputStream for writing, and hooks up flush()
to be a blocking call which returns only when all outstanding write()
data has been fsync()'ed to disk.

Tests to verify behavior.

Bug: 14975160
Change-Id: I38289867c80ac659163bb0c2158ef12d99cc570d
2014-05-22 15:54:16 -07: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
Andrew Solovay
59f61cc23d am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '768a899f214dd2fcf4bf3857549fee81b22debc4':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:50:45 +00:00
Andrew Solovay
768a899f21 am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit 'b59608981ff464b85a26987b8822913e41e72291':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:45:06 +00:00
Vinod Krishnan
eae1e09459 am 810ed89c: Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev
* commit '810ed89c244060beefa91470e0fa3d50d679caba':
  Adding activity enter/exit animations for wearables
2014-05-22 22:44:53 +00:00
Aravind Akella
c7153377cf am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev
* commit '73da981fd60f9dc855a04ea53e9fff59a011577e':
  Remove getRequiredPermission from NDK.
2014-05-22 22:44:49 +00:00
Nick Vaccaro
1af1371e1b am 117df282: Don\'t grab wakelock if Wifi feature not supported on device
* commit '117df282017945f3b3f05dc43a6f436d19d3f071':
  Don't grab wakelock if Wifi feature not supported on device
2014-05-22 22:44:44 +00:00
Griff Hazen
e5b73ae234 am c3104157: Api updates for wearable extensions to notifications
* commit 'c3104157d8f12238b0ac8cf6c6f963dadb44167c':
  Api updates for wearable extensions to notifications
2014-05-22 22:44:35 +00:00
Andrew Solovay
b59608981f am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '9562863cf184fe99be223aff9700b3ceb8559e1a':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:41:55 +00:00
Vinod Krishnan
810ed89c24 Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev 2014-05-22 22:39:42 +00:00
Christopher Tate
4e7a225589 Merge "Don't crash uninstalling updates to system apps" 2014-05-22 22:11:06 +00:00
Aravind Akella
73da981fd6 Merge "Remove getRequiredPermission from NDK." into klp-modular-dev 2014-05-22 22:01:23 +00:00
Eino-Ville Talvala
88aca033ff Merge "Camera2: New capture session interface" into lmp-preview-dev 2014-05-22 21:56:55 +00:00
Christopher Tate
f71ece48a1 Don't crash uninstalling updates to system apps
Bug 15167960

Change-Id: I606638292e524078f2859ba6be0a4861a4e01c00
2014-05-22 14:55:11 -07:00
Andrew Solovay
9562863cf1 doc: Updated branding guidelines per request from @deniseamling.
Per her team's request, I also removed the AI version of the Google
Play Store icon, and replaced it with a high-rez PNG version.

Current version of doc is staged at:

http://asolovay.mtv:9010/distribute/tools/promote/brand.html

(Denise gave me a LGTM via email.)

Bug: 14621461

Change-Id: Id44a0dc73c7ef2f2bde595a1e98b75083d126176
2014-05-22 21:54:27 +00:00
Nick Vaccaro
117df28201 Don't grab wakelock if Wifi feature not supported on device
Only grab the suspend wakelock when handling screen on/off
transitions if the device actually supports Wifi.

Bug: 14250726
Change-Id: Ic332cf84e40622ab6bbe60a2288ee478f1cabb2a
2014-05-22 21:48:22 +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
Griff Hazen
c3104157d8 Api updates for wearable extensions to notifications
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.

Minor fix to RemoteInput to use flags int for boolean options.

Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-22 14:38:36 -07:00
Jorim Jaggi
b37637b6fd Merge "Move clock and top padding while dismissing Keyguard." 2014-05-22 21:37:17 +00:00
Santos Cordon
5c013261a9 Merge "Adding ITelecommService definition for Telecomm." 2014-05-22 21:21:41 +00:00
vandwalle
567d3f461b Merge "revert change preventing NULL SSID in a WifiConfiguration" 2014-05-22 20:59:45 +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
Aravind Akella
8bcdd9b7a5 Remove getRequiredPermission from NDK.
Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
2014-05-22 13:33:52 -07:00
Andrew Solovay
7f24adf19b Merge "Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener." into klp-docs 2014-05-22 20:23:50 +00:00
Jorim Jaggi
afc11f196c Move clock and top padding while dismissing Keyguard.
Such translation. Much alpha. Very parallax. Wow.

Bug: 15163546
Change-Id: Id419acced94083cf6cd7abebbcf1d5a08439b0a7
2014-05-22 21:58:10 +02:00
Dmitriy Ivanov
c774dcee9d Increase start timeout for wrapped process
* apparently 300*1000 for valgrind is not enough
   (hammerhead aosp tot).

Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
2014-05-22 12:40:25 -07:00
Raph Levien
186213f28c Merge "Roboto v2" 2014-05-22 19:37:03 +00:00
Lorenzo Colitti
a8aad1b65f Merge "Fix Ethernet documentation." 2014-05-22 19:22:57 +00:00
Winson Chung
f13cd857e0 Merge "Removing unnecessary public values. (Bug 14995844)" 2014-05-22 19:20:14 +00:00
Aravind Akella
94e4d29eff Merge "Hide Sensor.getRequiredPermission API." 2014-05-22 19:11:53 +00:00
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