52760 Commits

Author SHA1 Message Date
Craig Mautner
d163e75189 Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.

Change-Id: I7bac1aa1d96fa7922cc835949730a26204f15f2f
2014-06-13 17:39:35 -07:00
Alan Viverette
a8e9529b73 Merge "Support hotspots in View drawables" 2014-06-13 21:09:46 +00:00
Alan Viverette
996ed45b0d Fix bright foreground & hint colors
BUG: 15616463
Change-Id: I747a3fd30e701bd2ee40df5faf2688cd5af4ee14
2014-06-13 15:58:25 -07:00
Alan Viverette
cebc6bab51 Support hotspots in View drawables
BUG: 15285217
Change-Id: Iad44454fe16ac27ed20b9c17ae2df69649339eed
2014-06-13 15:52:13 -07:00
Ido Ofir
29372ab484 Adding permission for launching the trust agent settings.
Change-Id: Iac5bde57ca8d465fdf0fa5848d6716fc88801aeb
2014-06-13 14:52:19 -07:00
Qiwen Zhao
677d4ae6ea Merge "Merge commit '0f3d3dd2'" 2014-06-13 21:09:46 +00:00
Qiwen Zhao
220cad6d97 Merge commit '0f3d3dd2'
Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-06-13 14:43:51 -07:00
Zhijun He
0cb41fd5ad Merge "Camera2: Add rollingShutterSkew tag" 2014-06-13 21:09:46 +00:00
Zhijun He
0bda31afe0 Camera2: Add rollingShutterSkew tag
Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18
2014-06-13 14:38:39 -07:00
Justin Koh
0f3d3dd26c am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."
* commit 'dd5c94717077c9366dee364c88a86a78e5ee2688':
  Revert "Close ActivityView and ActivityContainer cleanly."
2014-06-13 17:27:48 +00:00
Justin Koh
dd5c947170 Revert "Close ActivityView and ActivityContainer cleanly."
This reverts commit 4a9f129874785d34930f165268dbc618e4bc2618.

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ic1f4df7f4cb644de7ddebcdc8ce632b46c5ba8f2
2014-06-13 09:55:09 -07: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
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
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
Calin Juravle
cdd1fd7a8f am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 17:32:50 +00:00
Calin Juravle
5fc4e48742 am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
  Improved profile.start-immediately comment
2014-06-11 17:32:40 +00:00
Fabrice Di Meglio
2b3818e9a8 Merge "Fix bug #15414236 Define a framework theme for system settings" 2014-06-11 08:41:11 +00:00
Fabrice Di Meglio
fb82d4837f Fix bug #15414236 Define a framework theme for system settings
- add missing Material preferencePanelStyle / preferenceHeaderPanelStyle /
preferenceListStyle / preferenceFragmentListStyle / preferenceFragmentPaddingSide
- add needed material dimens
- fixed PreferenceFragment.Material
- done it for the normal and light theme

Change-Id: Ib25288a499ab6b1ee42b2d0c72a2e5a1be084e5f
2014-06-13 14:15:34 -07:00
Wink Saville
24683f1e15 Merge "Merge kwd to master" 2014-06-12 05:34:42 +00:00
Wink Saville
fb40dd4d00 Merge kwd to master
Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
2014-06-13 13:30:57 +00:00
Przemyslaw Szczepaniak
6dfa6e2a9b Fix typo and broken sdk build.
Change-Id: Icd1641955d1ca88396219db05312a4a9fd77ea80
2014-06-13 13:43:26 +01: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
John Reck
5efb7a2776 Merge "Don't buildLayer if size == 0" 2014-06-11 08:41:11 +00:00
John Reck
1e96bdf344 Don't buildLayer if size == 0
Bug: 15598692

Change-Id: Ia4e9e68c712b318b8d66e8cdfb2aceda4e892289
2014-06-13 13:01:28 -07:00
Mike J. Chen
92537739db Merge "Update android-logo boot animation" 2014-06-12 05:34:42 +00:00
Selim Gurun
4ffd507e67 am a5aa4b48: Merge "Address the API review" into lmp-preview-dev
* commit 'a5aa4b4879761a93c936303cf5c34d499aa0fe76':
  Address the API review
2014-06-13 19:25:35 +00: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
Selim Gurun
4473427f85 Merge "Address the API review" into lmp-preview-dev 2014-06-12 05:34:42 +00:00
Selim Gurun
ee89ab4dd5 Address the API review
Bug: 15432556

The api council asks to change the interface to an abstract class
and clarify the clearClientCertPreferences api. This change addresses
these.

Change-Id: I7979788c7c041bacbfef5ea4d94309f91279ef22
2014-06-13 10:53:55 -07:00
Griff Hazen
579ace0358 am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
  Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
2014-06-11 01:18:36 +00:00
Lorenzo Colitti
7ec99f0294 Merge "Assert that RT_SCOPE_* and IFA_F_* are not zero." 2014-06-10 22:36:02 +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
John Reck
816f71b7e0 Merge "Move LayerType to RenderNode" 2014-06-12 05:34:42 +00:00
John Reck
25fbb3fa11 Move LayerType to RenderNode
Change-Id: Icb79a5015cb0362b1f3a66d09007450730135a97
2014-06-12 19:25:33 -07:00
John Reck
a447d29c65 Fix DA bugs
* Now aware of transform of DrawDisplayListOp
 * Supports projection

 Bug: 15539677
 Bug: 15506680

Change-Id: Ic16f482cd48c3add12e49eca529281be12b93491
2014-06-12 09:13:45 -07:00
Amith Yamasani
4118ac825a Merge "Show user switcher if guest is enabled" 2014-06-12 05:34:42 +00:00
Amith Yamasani
a596ff87cd Show user switcher if guest is enabled
even if there's only one user.

Bug: 15549064
Change-Id: Ib9bc5e6cdc6f2655e44ec0a10a701dd39389e648
2014-06-12 18:13:09 -07:00
Eino-Ville Talvala
c5c363f0ff am 14b5f131: Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev
* commit '14b5f131c7118d58a6215e1f6d877d5cd31de54c':
  camera2 docs: Fix instructions for using SurfaceView.
2014-06-13 00:35:59 +00:00
Aravind Akella
221748039c Merge "Add java APIs for Sensor reportingMode." 2014-06-12 03:30:50 +00:00
Griff Hazen
9f637d1095 Reduce notification service historical archive size to 1 for watches.
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
2014-06-10 15:31:48 -07:00
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +00:00