142882 Commits

Author SHA1 Message Date
Andrew Solovay
0791c612b9 am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs
* commit '3f8d9c9e0a67a87009ee42904d3f08fe2f1371c6':
  docs: Replaced deprecated fill_parent with match_parent.
2014-07-16 13:22:44 +00:00
Quddus Chong
b2b1c5fa89 am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551
* commit '6a5dd93652ffce88891c2bd2dc7a19c764075631':
  docs: Fixed typo in L Preview API Overview. bug: 15696551
2014-07-16 13:22:44 +00:00
Ricardo Cervera
0acf9d2f9a am de138276: docs: Fix typos in the L preview docs. Bug: 16240486
* commit 'de138276f1c0a02f91e32f889639c629d883f948':
  docs: Fix typos in the L preview docs. Bug: 16240486
2014-07-16 13:22:43 +00:00
David Friedman
ddf853e0ce am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.
* commit '7f6af88e9460b788f68e956c9b104bc68fcfc8c4':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.
2014-07-16 13:22:43 +00:00
Chulwoo Lee
d0d02e22ce Introduce "input_id" column to the channels table
Until now, TvInputService has been providing the channels. But from now
on, a TvInputService can have several TV inputs and the TV input will
provide its channels.
So introduced "input_id" which is the ID of the TV input instead of
"service_name" which designates the TvInputService.
Also updated related APIs.

BUG: 16138420
Change-Id: I1d4dcad17c028384ab75a7f71ee0b305509ae952
2014-07-16 12:19:03 +00:00
Chulwoo Lee
029179d7f9 Pass input ID to the setup/settings activity
In the setup/setting phase, the activities should know their input ID
to access the channels/programs table.

Change-Id: If7afcb0ea474dca08c3dee06cbfcf76191a68660
2014-07-16 20:26:12 +09:00
Shishir Agrawal
8b4649c2e6 Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev 2014-07-16 02:25:05 +00:00
Sharvil Nanavati
4990e4f0e3 Launch processes running under the 'bluetooth' uid with CAP_WAKE_ALARM.
This is required since bluedroid needs to set wake alarms and timers.
Going through JNI back into Java code and then across Binder to
AlarmManager is both inefficient and doesn't provide the resolution
required for functions like A2DP.

Change-Id: I619be0b18a9e7ac2567b7c68ba84fcd15eecf715
2014-07-16 20:32:48 +00:00
Shishir Agrawal
ed9c3a4a1f Unhiding the SMS/MMS APIs for injection/transport.
Change-Id: I9e634c8f1c42738465825e767bc7ef3c4778eb30
2014-07-16 13:21:43 -07:00
Fabrice Di Meglio
278387fb5f Fix bug #16309454 Broken recent button after dismissing set time dialog
- correct set and use the Canceled state

Change-Id: Id60ae14c493254193ee677b66388a64a49618273
2014-07-16 20:13:45 +00:00
Jeff Davidson
61a5a3f2c3 Remove obsolete remark from XXHDPI comment.
XXHDPI screens now make up 15% of all Android devices, so developers
should be encouraged to include assets at this density.

Change-Id: I9d845769233a71dd954b5f35246aabb774a1c40d
2014-07-16 13:10:18 -07:00
David Friedman
12958a42ac am c6474d97: am fe545cdb: A linebreak had somehow wrongly replaced a blank space. Blank space restored.
* commit 'c6474d97cc11bf1dbda701efe1220f6bf6e165cf':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.
2014-07-16 19:54:05 +00:00
Deepanshu Gupta
8ee6bcf809 Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]
Not all PorterDuff modes are supported by Java's AlphaComposite. Use
BlendComposite for such modes.

Change-Id: I51486a40f09186cf8a87ce1e6a3d1cfcf39fb2d3
(cherry picked from commit b15709cd36d28c47660b0ae30918642bfd3d85f7)
2014-07-16 19:53:38 +00:00
Deepanshu Gupta
47fa5c920d Optimize Blend composites. [DO NOT MERGE]
Removed redundant array allocations to improve performance for various
blending modes.

Change-Id: Iaba1d6ff3ad03eebdc859c599b610cc593370438
(cherry picked from commit 9ce074610413ce3a5dd0cef9295f0ae9061402b7)
2014-07-16 19:52:48 +00:00
Deepanshu Gupta
3dfc1c21d5 Add BlendComposite.java [DO NOT MERGE]
The class is adapted from a demo tool for Blending Modes written by
Romain Guy (romainguy@android.com). The tool is available at
http://www.curious-creature.org/2006/09/20/new-blendings-modes-for-java2d/

Change-Id: I8f7c7ca08d3078106056764a4e2f1ce95d990137
(cherry picked from commit 882e08759137a77090c3c7dff8cba425a3393474)
2014-07-16 19:52:24 +00:00
Robert Ly
f49e33c87e am f3c3edfe: am bafdb900: am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
* commit 'f3c3edfee8d9a2148603c1082e128f8bcbe44fc0':
  docs: add EU legal notice
2014-07-16 19:32:11 +00:00
Alan Viverette
e4272bb323 Merge "Fix state list drawable transitions" into lmp-dev 2014-07-16 02:25:05 +00:00
Alan Viverette
d646fa2933 Fix state list drawable transitions
BUG: 16345178
Change-Id: I3a4f09462ac127bfb2adba6f63f5f44e5d4ea693
2014-07-16 20:11:53 +00:00
Winson Chung
cc91208963 Merge "Don't clobber intent flags when starting recent activities anew. (Bug 16327074)" into lmp-dev 2014-07-16 02:25:05 +00:00
Winson Chung
dc9b7e7e6a Don't clobber intent flags when starting recent activities anew. (Bug 16327074)
Change-Id: I3bfee312d5e3167d443be48580da55d8b69b485e
2014-07-16 18:27:22 +00:00
Chris Smith
93a412ea39 am 23a0b3d9: am 211c5844: am 7a047941: docs: Fix minor issues with Wear data events docs.
* commit '23a0b3d9d5e77a3fe5d353339c181bf729de4ff8':
  docs: Fix minor issues with Wear data events docs.
2014-07-16 18:18:59 +00:00
RoboErik
ac17c2a8c9 Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev 2014-07-16 16:25:13 +00:00
RoboErik
1ff5b1648a Change adjustVolumeBy to adjustVolume
This makes volume adjustments take a direction instead of a number of
steps and renames the API appropriately.

Change-Id: I6a31cbc42d889a38aa63446686a424cb2b8b2270
2014-07-16 12:03:45 -07:00
RoboErik
8b4bffcac9 Make MediaSession and MediaController constructors public
This makes the MediaSession/Controller constructors public and registers
with the system behind the scenes.

This also adds a bit about needing to call setActive(true) to start receiving
commands in MediaSession's docs.

Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
2014-07-16 12:03:45 -07:00
ztenghui
0d12785dfb Merge "Add more reverse support to AnimatedVD" into lmp-dev 2014-07-16 00:46:50 +00:00
ztenghui
7bc6a3f023 Add more reverse support to AnimatedVD
bug:16162242

Change-Id: Ie0b7618beeb65ebeb65db41600165837524bcee4
2014-07-16 19:26:26 +00:00
RoboErik
71940885f2 Merge "Make MediaSession and MediaController constructors public" into lmp-dev 2014-07-16 13:12:22 +00:00
Narayan Kamath
ce83a28c24 Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev 2014-07-16 01:00:53 +00:00
Narayan Kamath
2053168eb4 Dexopt for Context.createPackageContext when code is included.
The package manager now keeps track of per ISA dex-opt state.

There are two important things to keep in mind here :

- dexopt can potentially be very slow. In cases where the target
  package hasn't been dexopted yet, this can take multiple seconds
  and may cause an ANR in the caller if the context is being
  created from the main thread.
- We will need to remove the constraint that dexopt can only be
  requested by the system (or root). Apps will implicitly be
  requesting dexopt by asking for package contexts with code included.
  It's important to note that unlike dalvik, the dexopt stage in ART
  isn't optional. ART cannot load classes directly from dex files.

bug: 15313272
Change-Id: I0bd6c323a9c1f62f1c08f6292b7f0f7f08942726
2014-07-16 19:23:52 +01:00
Yorke Lee
95a18a8f96 Merge "Make ContactPreferences use SharedPreferences instead of System settings (1/5)" into lmp-dev 2014-07-16 00:46:50 +00:00
Jean-Michel Trivi
5d06ef49b1 Merge "MediaPlayer factory method with audio attributes and session ID" into lmp-dev 2014-07-16 02:18:09 +00:00
Jean-Michel Trivi
d70ad7a128 MediaPlayer factory method with audio attributes and session ID
Change-Id: I4e7f633c84c90581e849af2865f5be84a026f32f
2014-07-16 18:36:20 +00:00
Quddus Chong
564ddefc57 am 6743f1ea: am 1a2a9730: am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs
* commit '6743f1ea92e8c1516774d38469511d189a1bf5eb':
  docs: Fixed small typo. bug: 14617866
2014-07-16 18:23:27 +00:00
Bill Yi
96f6a1a9e7 DO NOT MERGE - Fix build issue isScreenOn
Change-Id: I8821efd561d375c32702be55903fe401ab719e80
2014-07-15 22:50:55 +00:00
Ricardo Cervera
5a19dd522f am 35396800: Merge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into klp-modular-dev
* commit '3539680063e039f5d543677805de7f4639575b1e':
  docs: Added note on disabling debugging for WebView apps. Bug: 16232761
2014-07-15 21:05:38 +00:00
Justin Mattson
1d935abdd5 Merge "Put annotations in the right place" into lmp-dev 2014-07-15 20:46:43 +00:00
Justin Mattson
87ce1d2b1a Put annotations in the right place
Put annotations in the theme defintion rather than in the public.xml
file.

Change-Id: I078b7676423be4cd362df251be630c1617da030c
2014-07-15 21:32:42 -07:00
Marcin Kosiba
bce81bd03d Merge "Add more params to WebViewClient.shouldInterceptRequest." into lmp-dev 2014-07-15 20:46:43 +00:00
Marcin Kosiba
d72e7ba1c0 Add more params to WebViewClient.shouldInterceptRequest.
This changes shouldInterceptRequest to take an object containing the
following new parameters: isMainFrame, hasUserGesture, method, headers.
This also lets the embedder specify the following additional properties
of the response: status code, response phrase, headers.

BUG: 7589347
Change-Id: Id922c5e7023eb067db871e6f782f599492a2428f
2014-07-15 21:31:44 -07:00
Ben Murdoch
7302f4f8f7 Plumb temporary view detach calls through WebView.
Intercept View#onStartTemporaryDetach/onFinishTemporaryDetach
to handle focus changes correctly.

Bug: 14313621
Change-Id: I92ba2f44359643fee63f30b9c35b1ae4183e4245
2014-07-16 03:28:43 +00:00
Ricardo Cervera
3539680063 Merge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into klp-modular-dev 2014-07-15 20:39:52 +00:00
Jeff Sharkey
795903e83d Merge "Mark resource-only splits as hasCode=false." into lmp-dev 2014-07-15 20:39:52 +00:00
Jeff Sharkey
78a130144b Mark resource-only splits as hasCode=false.
PackageManagerService now skips dexopt for split APKs that don't
declare they have code.  Also surface more detailed error messages
in logs.

Bug: 14975160
Change-Id: Ie6078dba724815020cee59b7fc52317e88ca097a
2014-07-15 20:18:39 -07:00
Jeff Sharkey
da96e137bc Parse more split APK manifest details.
Allow split APKs to define activities, services, receivers,
providers, and metadata.  However, support for many manifest items
are explicitly omitted.

Only dexopt split APKs that include code.

Bug: 14975160
Change-Id: I2fbf99e2a62328aa2185e5924755af33060282fc
2014-07-15 18:50:00 -07:00
Lajos Molnar
e66de8f358 Merge "MediaCodec: add reset() + documentation fixes" into lmp-dev 2014-07-15 20:46:43 +00:00
Svetoslav
cc2b210ff8 Merge "Update the promoted action background color per UX spec" into lmp-dev 2014-07-16 02:18:09 +00:00
Lajos Molnar
1e6e8018a4 MediaCodec: add reset() + documentation fixes
Bug: 12034929
Change-Id: I38f89a2e4c41e0ceb3fdae4522b9c04f6c43a4f1
2014-07-15 18:14:04 -07:00
Svetoslav
4bcc4a042c Update the promoted action background color per UX spec
bug:16303010

Change-Id: I54663a0be79b232a29d8fced4a772a32b4d83ae5
2014-07-15 17:33:52 -07:00
Svetoslav
e323dcc31d Drop of the final UX assets for printing.
bug:15705610

Change-Id: I82104a2c0b3d1f4e34f71357b10bed24c0583e71
2014-07-15 17:16:40 -07:00
Svetoslav
73764e347d Update the page count in the print UI to meet new UX.
bug:15912257

Change-Id: I1aa3eb4f7e28d3d9c955f60a570c2f8800fdb88d
2014-07-15 15:56:52 -07:00