Winson Chung
4b5b892ca8
Merge "Enabling Home->Recents transition."
2014-06-12 17:09:07 +00:00
Winson Chung
ad6f276670
Enabling Home->Recents transition.
2014-06-13 09:41:09 -07:00
Mike Lockwood
94b59de852
BluetoothAvrcpController: Move AVRCP controller support to new BluetoothProfile subclass
...
Change-Id: Id988040a7ce623ed68e0349920301ff48db1fbce
2014-06-13 09:06:36 -07:00
Hemant Gupta
3b76a4b2b6
Add Support for AVRCP Controller Feature
...
- Provide support for AVRCP Controller CAT 1 and CAT 2
passthrough commands.
Change-Id: Iefbb7fcd6273c49dc8a305b7a25ec6e94c60a5a9
2014-06-13 09:06:36 -07:00
Mike Lockwood
2263dd1ddd
BluetoothA2dpSink: Add new BluetoothProfile subclass for A2DP sink
...
Change-Id: I09d5cb8fdaea4c4828f333949b7c18deffd22722
2014-06-13 09:06:35 -07:00
Mike Lockwood
0b611b5f3b
Add BluetoothHeadsetClientCall.toString method
...
Change-Id: I8a95fda4f67daa09dfefedffec804c06af53ebe0
2014-06-13 09:06:35 -07:00
Mike Lockwood
cf916d3467
Rename BluetoothHandsfreeClient to BluetoothHeadsetClient
...
This makes our terminology consistent with the existing BluetoothHeadset profile
Also updated arguments to Context.bindService()
Change-Id: I27cc5a6fde256b1f5dccca53a7a15ec8f58691c2
2014-06-13 09:06:35 -07:00
Hemant Gupta
7aca90fcc0
Bluetooth: Add support for HFP Client role.
...
Implementation changes in frameworks to support
HFP Client role.
Change-Id: Ifb10527cd6c1301297cae4f923b20734af672034
2014-06-13 09:06:35 -07:00
Baligh Uddin
cee3edd125
am 408b5adc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
...
* commit '408b5adceb2ead4c773c5df0906bfe965e0991e9':
Import translations. DO NOT MERGE
2014-06-13 14:28:16 +00:00
Baligh Uddin
20e1f39d61
am feed8571: (-s ours) Import translations. DO NOT MERGE
...
* commit 'feed8571eeea3d863c7e9c9a5964a68fe3b4692d':
Import translations. DO NOT MERGE
2014-06-13 14:28:10 +00:00
Baligh Uddin
da8a64b80b
Import translations. DO NOT MERGE
...
Change-Id: Ibdd11bf4b5a0ebb0394400688dd0e38a70660a62
Auto-generated-cl: translation import
2014-06-13 07:20:46 -07:00
Kenny Guy
17c9d69d70
Don't remove a user already being removed.
...
Check if UserManager is already removing
a user before starting to remove it.
Bug: 15583858
Change-Id: If9763e9b47355d9ae35cc621367c74725029aa90
2014-06-13 14:10:29 +01:00
Przemyslaw Szczepaniak
6dfa6e2a9b
Fix typo and broken sdk build.
...
Change-Id: Icd1641955d1ca88396219db05312a4a9fd77ea80
2014-06-13 13:43:26 +01:00
Winson Chung
a26fb7822d
Fixing issues with dim not animating, adding dismiss button delay, tweaking empty recents text. (Bug 15431590, 15573497)
...
Change-Id: I9c11e04cd52f9e000d8ba3e443f2500c9aa7edbb
2014-06-12 19:08:29 -07:00
Baligh Uddin
e31d9438db
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-12 21:07:47 +00:00
Baligh Uddin
0ce9237391
Import translations. DO NOT MERGE
...
Change-Id: Ic15fd186de8247f8a5cad5cce87218ebec6cd81e
Auto-generated-cl: translation import
2014-06-13 07:23:57 -07:00
Winson Chung
9214eff52a
Fix regression in using visibility flags.
2014-06-12 13:59:25 -07:00
Winson Chung
d42a6cfe2b
Exploring transitions to/from Recents.
...
- refactored hwlayers and change view property animations to use a reference counted trigger
- cleaned up RecentsConfiguration, and move it into classes using it
- moved task bar animations back into TaskBarView
- refactoring enter/exit animations to use an animation context
Change-Id: Ia66b622b094f22145c2fab07c2a9bdfd62344be2
2014-06-12 12:57:56 -07:00
Eino-Ville Talvala
fb587f4f6b
Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev
2014-06-12 17:09:07 +00:00
Eino-Ville Talvala
5ae1ca5b69
camera2 docs: Fix instructions for using SurfaceView.
...
Bug: 15597178
Change-Id: I802369e61725451ddd8df855c384608c80e12693
2014-06-12 17:02:17 -07:00
Sol Boucher
b8cee5175d
camera2: Remove stray </p> in CameraDevice#createCaptureSession
...
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.
Bug: 15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
2014-06-12 17:39:11 +00:00
Ihab Awad
879d8b3308
Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)" into lmp-preview-dev
2014-06-12 17:09:07 +00:00
Przemyslaw Szczepaniak
e31ab2d8fc
Merge "Expose "default tts locale" to the TTS V2 API."
2014-06-11 15:57:38 +00:00
Przemyslaw Szczepaniak
1b5637ee32
Expose "default tts locale" to the TTS V2 API.
...
This change allows TTS V2 API client applications to honor the
"default TTS locale" set by the user in the TTS settings.
Note that the TTS V1 API uses 3 character country/language codes
for locale encoding. It's the only system component that does
that. TTS V2 uses the standard, valid Locale objects. The default
TTS locale setting was stored as a 3 character locale string with
"-" as the separator.
This change switches the TTS locale setting format to the output of
Locale.toString() call (on a valid Locale object). Methods used for
reading this value can interpret both forms and try to return a valid
Locale object as an output.
Change-Id: Ice2e6c25a43eb9dd6e17d371ee582c2dae3329c9
2014-06-11 13:49:48 +01:00
Ihab Awad
d76faab7b3
DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)
...
Bug: 15275904
Bug: 15196474
Change-Id: If9aeae519047b221aa2c178d8d2903c4e2054a6d
2014-06-10 18:12:44 -07:00
Ji-Hwan Lee
53a1eaa771
Merge "LayoutLib: Fix broken sdk builds"
2014-06-10 22:36:02 +00:00
Ji-Hwan Lee
a3874f0ac6
LayoutLib: Fix broken sdk builds
...
Change-Id: I301b312195eb3e57cb581d015e7c0b0492084b3e
2014-06-13 20:34:54 +09:00
Lorenzo Colitti
7ec99f0294
Merge "Assert that RT_SCOPE_* and IFA_F_* are not zero."
2014-06-10 22:36:02 +00:00
Jeff Brown
2bcf05e5e9
am cd4c754e: am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev
...
* commit 'cd4c754e9917f3ad292e20a89f1f7d03f344a3cf':
Suppress haptic feedback for SLEEP key when already asleep.
2014-06-13 10:24:36 +00:00
Jeff Brown
49f186a295
am 1a073a8f: am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev
...
* commit '1a073a8f550695342e8e3902d2223fd237941e95':
When watch is docked, home key press should launch dock home.
2014-06-13 10:24:29 +00:00
Lorenzo Colitti
62388936c8
Assert that RT_SCOPE_* and IFA_F_* are not zero.
...
If these constants are zero (or, rather, if they're not all
different), the test will fail with more cryptic error messages
whose cause is not obvious. Clearly check for that here.
Bug: 15602893
Change-Id: I7ca4a9c5e3d592fd93fbfa1b50666a1861a0031d
2014-06-13 17:20:20 +09:00
Jinsuk Kim
63dd3bb360
Fixed a wrong path to HdmiPortInfo class
...
This fixes a JNI error for HdmiCecController
Change-Id: I8ce987dfa3126ecffd455a964c01d27fb9aa01eb
2014-06-13 14:46:17 +09:00
Jeff Brown
cd4c754e99
am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev
...
* commit '374013f4dba56c9ea340d22dcefdf904cbd47ce6':
Suppress haptic feedback for SLEEP key when already asleep.
2014-06-13 03:08:35 +00:00
Jeff Brown
1a073a8f55
am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev
...
* commit '926e1f01a5f2366c5d0eeab358822ba1d138d980':
When watch is docked, home key press should launch dock home.
2014-06-13 03:04:25 +00:00
Craig Mautner
4849aa86b1
am be634951: Fix permission problem and NPE
...
* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
Fix permission problem and NPE
2014-06-12 23:36:54 +00:00
Tim Murray
604ea0e415
am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
...
* commit 'b1c9430c8749b1feba59bb55a31cb1364270981b':
Move FieldPacker over to use large objects on 64-bit.
2014-06-12 23:08:39 +00:00
Tim Murray
b1c9430c87
am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
...
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
Move FieldPacker over to use large objects on 64-bit.
2014-06-12 23:05:16 +00:00
Nick Kralevich
50ece5ec53
am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."
...
* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
Add service_contexts to policy update bundles.
2014-06-12 21:10:30 +00:00
Jeff Brown
374013f4db
Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev
2014-06-12 21:07:47 +00:00
Jeff Brown
bae8e77db6
Suppress haptic feedback for SLEEP key when already asleep.
...
Bug: 15377857
Change-Id: I4dfd273b089871d3a78513f52436a3f9c7d40fa4
2014-06-12 19:59:45 -07:00
Jeff Brown
4f5fa285a8
When watch is docked, home key press should launch dock home.
...
Bug: 15575717
Change-Id: Ib3fbe3ed0380378b0162901bfeebe3c218c4d568
2014-06-12 19:19:15 -07:00
Nick Kralevich
9a0485aa56
am 1ef888e5: Merge "Add service_contexts to policy update bundles."
...
* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
Add service_contexts to policy update bundles.
2014-06-12 21:07:25 +00:00
Craig Mautner
be63495101
Fix permission problem and NPE
...
Remove uid before calling into Window Manager. Restore afterwards.
Check for null stack value before dereferencing.
Fixes bug 15591112.
Change-Id: Ida3de556940440162c91b8c1614d0f21e364abd8
2014-06-12 13:50:53 -07:00
Deepanshu Gupta
1434ea749f
am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev
...
* commit '92b7c67e719fa125a5af368eb9e00f724c88601d':
LayoutLib fixes for API 20 [DO NOT MERGE]
2014-06-12 20:04:12 +00:00
Scott Main
91b078c8dc
am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev
...
* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
2014-06-12 19:04:34 +00:00
Andrew Solovay
d51a5b3891
am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
...
* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:27:48 +00:00
Andrew Solovay
25b8af9d3f
am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
...
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:23:31 +00:00
Andrew Solovay
436f4e36d3
am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
...
* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:19:33 +00:00
vandwalle
3801202284
Merge "auto-roam fixes, disable scanning based on traffic at interface"
2014-06-12 05:34:42 +00:00
vandwalle
72d87d99b0
auto-roam fixes, disable scanning based on traffic at interface
...
Bug: 15575229
Bug: 15577651
Change-Id: Ia8914a90d803fd9e6ba9fa51efce50c7b7f1c692
2014-06-13 03:32:28 +00:00