Commit Graph

139174 Commits

Author SHA1 Message Date
Santos Cordon
b1768e398f Merge "Update API for conference calling." 2014-06-12 05:34:42 +00:00
Santos Cordon
86377e5377 Update API for conference calling.
Change-Id: Ic9b3d8fe98bb3f46e7f83d248785cb736186f445
2014-06-12 17:37:07 -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
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
Aravind Akella
221748039c Merge "Add java APIs for Sensor reportingMode." 2014-06-12 03:30:50 +00: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
destradaa
45c9ef2021 Merge "Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp." 2014-06-10 21:44:22 +00:00
destradaa
d5323174d8 Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp.
Change-Id: I6c15665118d52627978381935716436981a058d1
2014-06-12 11:47:05 -07:00
Robert Greenwalt
65599da861 Merge "Fix build" 2014-06-12 05:34:42 +00:00
Wei Wang
53fe28b7b6 LE: Add oneway attribute to Gatt callbacks
Adding the 'oneway' attribute to the GattService interface definition
prevents applications from blocking callbacks.

Bug: 15489651
Change-Id: Id7fcf7f95539092f03e5773ca318b5472b55cb4d
2014-06-12 23:48:41 +00:00
Robert Greenwalt
e595b97ff4 Fix build
Re-finalizing some classes.  The api/current.txt was updated separately but the change
that made them final got skipped.  Also had same issue for some @hide's that were removed.

Change-Id: I423bb7b3029ee03425a3c446bda51ab8191887c1
2014-06-12 16:24:38 -07:00
Jae Seo
796691e302 Merge "Add an API to get TV input icon" 2014-06-12 03:30:50 +00:00
Nick Kralevich
659e0e1d94 am 50ece5ec: am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."
* commit '50ece5ec53661a51ce5a15f782fdcd747171bc02':
  Add service_contexts to policy update bundles.
2014-06-12 21:16:51 +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
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
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
Jaewan Kim
cca74c1b0d Add an API to get TV input icon
Bug: 14423022
Change-Id: I7b3c0efadc8448cae56ef370611be8e09a301f42
2014-06-12 10:36:00 +00:00
Alan Viverette
04b8e270f2 Merge "Make overlapAnchor public, make ActionBar spinner overlap" 2014-06-12 05:34:42 +00:00
Alan Viverette
e178c93ff5 Make overlapAnchor public, make ActionBar spinner overlap
BUG: 15566102
Change-Id: I23885c2d66ce0749e4c131491205bb8eb2612923
2014-06-12 13:23:20 -07:00
Winson Chung
02a9c359a1 am e202fff5: Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev
* commit 'e202fff5f77568294ba4b50c879ca587535db3be':
  Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)
2014-06-12 18:08:09 +00:00
Fabrice Di Meglio
0044b20eb7 am 52771816: Merge "Fix Material Preference Framework layout" into lmp-preview-dev
* commit '527718164cbb28dff6be6073ba78515395bcf9e1':
  Fix Material Preference Framework layout
2014-06-12 18:08:04 +00:00
Raph Levien
12871e99d0 am 0e8a57cc: Merge "Support fake italics" into lmp-preview-dev
* commit '0e8a57cc1ff4d12791231177b679114b05279548':
  Support fake italics
2014-06-12 17:56:00 +00:00
Raph Levien
63fa80eaab am 7a5662e8: (-s ours) Merge "Support for fake bold in Minikin builds" into lmp-preview-dev
* commit '7a5662e807f0e99bd8499a52ffed9d114d299f80':
  Support for fake bold in Minikin builds
2014-06-12 17:55:54 +00:00
Raph Levien
c9f705b8f9 am 7204116b: (-s ours) Merge "Fix getFontMetrics problems" into lmp-preview-dev
* commit '7204116b97bd5e1f79113566577c89c4d0925255':
  Fix getFontMetrics problems
2014-06-12 17:49:23 +00:00
Nick Kralevich
1ef888e564 Merge "Add service_contexts to policy update bundles." 2014-06-12 03:32:07 +00:00
Riley Spahn
5f5cf5f670 Add service_contexts to policy update bundles.
Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.

Bug: 12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b
2014-06-12 20:46:34 +00:00
Dirk Dougherty
866ad0c2b2 am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit '460cab199df38b16ea1a4fc9e4f62509049cc859':
  Doc change: Update monetization docs.
2014-06-12 02:44:11 +00:00
Dirk Dougherty
460cab199d am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
  Doc change: Update monetization docs.
2014-06-12 02:41:07 +00:00
Dirk Dougherty
b024fd2087 am bdcd6fc7: Doc change: Update monetization docs.
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.
2014-06-12 02:37:27 +00:00
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs.
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
2014-06-11 17:52:07 -07:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
2014-06-12 00:06:20 +00:00
Elliott Hughes
8525fe8d0a am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.
2014-06-12 00:02:42 +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
Scott Main
55c11af78a 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 2014-06-11 21:23:31 +00:00
Scott Main
4795031492 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.

Change-Id: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
2014-06-11 20:17:05 -07:00
Svetoslav
3d187c2e9f Merge "Fix backwards compatibility for introspected windows." 2014-06-11 21:23:31 +00:00
Svetoslav
f7174e87b6 Fix backwards compatibility for introspected windows.
1. The APIs for introspecting interactive windows were reporting only
   the touchable windows but were missing the focused window. The user
   can interact with the latter by typing, hence it should always be
   reported. Also this was breaking backwards compatibility as if the
   focused window is covered by a modal one, the focused window was not
   reporeted and this was putting the active window in a bad state as
   the latter is either the focused window or the one the user is touching.

2. Window change events are too frequent as on window transition things
   are chanign a lot. Now we are trottling the windows changed events
   at the standard recurring accessibility event interval.

3. Fixed a wrong flag comparison and removed some unneded code.

buy:15434666
bug:15432989

Change-Id: I825b33067e8cbf26396a4d38642bde4907b6427a
2014-06-12 12:11:39 -07:00
Winson Chung
582e2731b4 Merge "Fix regression in using visibility flags. " 2014-06-12 03:30:50 +00: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
Jason Monk
4e81913a66 Merge "Allow device owner to configure secondary users" 2014-06-12 17:09:07 +00:00
Jason Monk
03978a40b3 Allow device owner to configure secondary users
Currently the device owner can create secondary users, but unless
it is a system app it will not be installed and will not be able
to pass data easily from the code that creates the user and any
code running on that user.

This allows the device owner to install itself while creating a
user and start up a service to configure that user.  createUser
takes an bundle so that the device owner can pass across any
initial setup data it needs to, this bundle will be sent to
the admin receiver in onEnable.

Change-Id: Ic1f8565dd2a7bd85363527cf68b0ecd4dc9c3636
2014-06-12 16:30:00 -04:00