5395 Commits

Author SHA1 Message Date
Yao Chen
c2c0bdc10a Merge "s/thumbnail/icon in the browsing api." into lmp-dev 2014-07-24 20:48:02 +00:00
Yao Chen
5f3e1f2a2d s/thumbnail/icon in the browsing api.
Change-Id: I73bf76ed9628872094db74aef48a8e68864d6b4d
2014-07-28 11:35:36 -07:00
Bo Liu
c15fbba494 Merge "Add WebView.enableSlowWholeDocumentDraw" into lmp-dev 2014-07-28 18:28:56 +00:00
RoboErik
e0b8c378b7 Merge changes I87f551a7,Icb8dc76c,I66fbf585,I0c9506e7 into lmp-dev
* changes:
  Add context to MediaController constructor
  Add getPackageName to MediaController
  Expose a way to set a PendingIntent for restarting playback
  Finish plumbing for launch intents in sessions
2014-07-25 21:16:23 +00:00
RoboErik
031149cd5f Add context to MediaController constructor
This also adds a convenience method to MediaSession to allow getting
a controller instead of having to create and cache your own.

bug:16561220
Change-Id: I87f551a7474e71f1cf2f07e0e541c3a4515cd977
2014-07-28 11:02:15 -07:00
RoboErik
aa4e23bbb3 Add getPackageName to MediaController
This removes the MediaSessionInfo class and adds a method on the
controller to get the package name. This also converts code that
depended on the session's UUID to use the token for comparison or
the Tag in the case of test code that needs a string identifier.

Change-Id: Icb8dc76c70e23e897da8fd07651c524b96372bf9
2014-07-25 16:22:59 -07:00
RoboErik
b214efbb91 Expose a way to set a PendingIntent for restarting playback
This is to allow apps to set a PendingIntent to restart playback. This
is not persisted across reboots but will allow music to start playing
again for the life of the system. Only the most recent priority app with
a PI set will be cached. This also deprecates methods in AudioManager
that do this and unhides the unregister method in MediaSessionManager.

Change-Id: I66fbf5856333468d8cb8a3022809778ba00d426e
2014-07-25 16:22:18 -07:00
RoboErik
e34c09daf8 Finish plumbing for launch intents in sessions
This finishes out the plumbing for setting a launchable PendingIntent
on a session and getting it from a controller to launch an app's UI.

Change-Id: I0c9506e7c3f0ebf57070ca7e0d91324eb3fdd1e1
2014-07-25 16:22:17 -07:00
RoboErik
76fca4e177 Add getFlags and getSessionToken to MediaController
getFlags was hidden, should have been public. Also added getSessionToken
as a convenience method for apps to get the token used to create a
controller.

bug:15408392
Change-Id: Icb19b43ebb7e01727eec1a4e667dafcfc3b8d4eb
2014-07-25 16:22:16 -07:00
RoboErik
30674e91a2 Merge "Add getFlags and getSessionToken to MediaController" into lmp-dev 2014-07-24 20:48:02 +00:00
Andrew Lee
1418576521 Move VideoCallProvider into ConnectionService.
Bug: 16494880
Change-Id: I0778197d06fcd219db4a1e1fa065e69026254a99
2014-07-28 10:41:37 -07:00
Lorenzo Colitti
c473dc4e4f Add a getBoundURL method that returns a network-specific URL.
Change-Id: I4b57e675bb87064ab75dcc36b00fdc7a2987b86e
2014-07-28 16:16:58 +00:00
Evan Charlton
17a3814ac6 Merge "Make creating the Connection synchronous" into lmp-dev 2014-07-24 15:36:21 +00:00
Evan Charlton
bf11f98deb Make creating the Connection synchronous
Get rid of CreateConnectionResponse and have the ConnectionService
return the built connection instead.

Change-Id: Ibbf896e5b188b98eb386d6624d3a5d5cacf49922
2014-07-25 11:07:50 -07:00
Jay Civelli
3087e49667 Add new intent to prompt user for their device credential. DO NOT MERGE
Bug: 16242766
cherry-pick from master 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26

Change-Id: I76efb3bef888eb1e94c4e5455934816fb4acc5bc
2014-07-25 22:04:19 +00:00
Andrew Lee
63e44bd999 Merge "Add VideoCall and VideoCall.Listener as an inner classes of Call." into lmp-dev 2014-07-24 22:43:15 +00:00
Kenny Guy
466d203c4f Add method to launch settings app details page.
Add a method to LauncherApps to allow launchers to
show application details for an app in a managed profile.

Bug: 16371359
Change-Id: I23acb4365c09e4a7b9fa742ae6fc7e04434f45aa
2014-07-25 15:59:51 +00:00
Andrew Lee
50aca23bd7 Add VideoCall and VideoCall.Listener as an inner classes of Call.
Bug: 16494880
Bug: 16495203
Change-Id: Ife3b6723374ea5fbbff4927c4f9168d075be21e1
2014-07-25 08:58:10 -07:00
Kenny Guy
237aecd18d Change getBadgedLabelForUser to use CharSequence
Bug: 16401636
Change-Id: I45410a6293007dd789d6770d63397824559b756e
2014-07-25 10:12:11 +00:00
Santos Cordon
9d0f7c4fbc Add more disconnect causes 1/4
Bug: 15692074
Change-Id: Ib94c33fac8450b70e53dbe12d71f41777e9e140c
2014-07-25 03:16:00 +00:00
Craig Mautner
8746a478ab Create end of animation callback for Activity
Activities cannot draw while their entering animations are active.
This change introduces a callback, onEnterAnimationComplete() so
that activities can know when their draws will be effective.

Fixes bug 13658460.

Change-Id: Ic48540cd4c7e37538f10cb2dc0852aa3f55d11e1
2014-07-25 01:35:02 +00:00
Dongwon Kang
94a509b123 Remove COLUMN_CONDITIONAL_ACCESS from TvContract.
It turned out that having this flag in Channels table does not
make sense for some European countries because they scremble the signal
per program basis. Also, the current flag does not fit to the use-case
like 'pay per view'. Decided to remove this in L release because it's not
clear how we will handle the cases raised at this moment.

Change-Id: Ibbf829f331a307ac89a553e00ece18d5958e72b5
2014-07-25 10:19:12 +09:00
Zhijun He
86c545ea8c MediaFormat: add capture rate key
Change-Id: I2f7dd244d41d52aab6a172ae5df3e1fce3edd694
2014-07-25 00:52:42 +00:00
Selim Gurun
c5a1e2c872 Merge "Address API review" into lmp-dev 2014-07-24 22:06:48 +00:00
Selim Gurun
48f6c45069 Address API review
Bug: 16403458

Address API review. This change updates the FileChooser api. The
largest change is, as requested by API council, providing a helper
to reduce the code app developers need to implement. This
change does not include the CookieManager changes that was requested.

Change-Id: I30d75f36df6bc96d9842b63fdd25c4ff62aee5bb
2014-07-24 15:18:57 -07:00
Yorke Lee
eea3c5d735 Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev 2014-07-24 15:36:02 +00:00
Yorke Lee
7d24679c6c Update the value of PinnedPositions.UNPINNED to 0
Bug: 16403306
Change-Id: I6ff5a6051694245831db31db9d37ac0793eb0c32
2014-07-25 10:05:55 -07:00
Alan Viverette
78b7211507 Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev 2014-07-24 22:06:48 +00:00
Alan Viverette
e88700a2ad Remove duplicate Toolbar method for setting content description
Also moves the setNavigationIcon(int) method closer to the one that
takes a Drawable.

BUG: 16491458
Change-Id: Ia02f05e6270c9d420f61f7ab34117b4c7e6548ec
2014-07-25 12:57:31 -07:00
Jeff Sharkey
16c8e3f494 PackageInstaller changes based on feedback.
Mostly cosmetic changes from API council feedback.

Bug: 16543552
Change-Id: Ic926829b3f77c31f50a899c59b779353daf00d59
2014-07-25 11:59:48 -07:00
Yao Chen
186655285f fix build
Change-Id: Id5a93019b60ac4881f398b80de2e14786776a883
2014-07-25 11:23:30 -07:00
Paul Soulos
6b2dd6337e Adds getTypeLabel to ContactsContract Event
Bug: 16550284
Change-Id: Ie95093a2c9bca2b9ba130dea470c8beef94cd659
2014-07-25 18:17:35 +00:00
Hector Dearman
d49d6bf0cd Merge "Update CookieManager API for Council review." into lmp-dev 2014-07-24 15:36:05 +00:00
Ruben Brunk
1b1f1b611c camera2: Move noise model to dynamic metadata.
Bug: 16369384

Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
2014-07-24 17:43:54 +00:00
Hector Dearman
ffae672881 Update CookieManager API for Council review.
Remove synchronized from setAcceptThirdPartyCookies

Bug: 16403458
Change-Id: I6073da2c03fd0952bc447f7cfe0d959148af6877
2014-07-24 18:10:25 +01:00
Jorim Jaggi
8a9068573c Merge "Fix status icon reappearing for legacy activities" into lmp-dev 2014-07-24 15:35:58 +00:00
Jae Seo
fbf35c9289 am ad83af39: am c20b846a: am 04c5422e: TIF: Rename methods in TvInputService
* commit 'ad83af3960d6eb00f17013a30198b7fd6842a817':
  TIF: Rename methods in TvInputService
2014-07-28 12:14:55 +00:00
Jae Seo
91a801d42f TIF: Rename methods in TvInputService
This change addresses the following council feedback.

TvInputService.Session:
-- Rename onRequestUnblockContent() --> onUnblockContent()
-- Change all dispatch* methods to be notify*

Bug: 16542165
Change-Id: Ib9c8dc825665fdf75ebd1d13b1e39c39514132f1
2014-07-28 17:28:15 +09:00
Alan Viverette
b49f099611 am c5697654: am 2720d7ba: am 77b2010c: Merge "Add public attribute for window clipToOutline" into lmp-dev
* commit 'c5697654cdaa433b3eddfa032cee4f2b6c77d97e':
  Add public attribute for window clipToOutline
2014-07-26 01:11:04 +00:00
Zhijun He
79a53de48c am 996db1f2: am c877e92e: am b52d22ce: Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
* commit '996db1f2f20c5375c1675c2d07249b7a83728fe5':
  CamcorderProfiles: add high speed profile constants
2014-07-26 01:10:51 +00:00
ztenghui
29e2dd95fd am 5b942f14: am 6038139c: am ed2a502c: Merge "API REVIEW: VectorDrawable" into lmp-dev
* commit '5b942f1430bc5bf6ee35455919b7985d8fdefdc2':
  API REVIEW: VectorDrawable
2014-07-25 23:42:46 +00:00
Evan Charlton
8e6e3234d1 am 8e7488da: am eeb7ea86: am 2f22a0eb: Merge "Make creating the Connection synchronous" into lmp-dev
* commit '8e7488dad21e6db08a8d9c15318f394aa04dfedd':
  Make creating the Connection synchronous
2014-07-25 23:13:26 +00:00
Yorke Lee
acaf686488 am ff650115: am e120d1e5: am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev
* commit 'ff65011576f13cd28cafe6a83098b18bf66344db':
  Update the value of PinnedPositions.UNPINNED to 0
2014-07-25 21:57:43 +00:00
Alan Viverette
d0e9449963 Merge "Add public attribute for window clipToOutline" into lmp-dev 2014-07-25 21:16:23 +00:00
Alan Viverette
40982d46f9 Add public attribute for window clipToOutline
Also ensures clipToOutline is false is the background is null.

BUG: 16549166
BUG: 16566746
Change-Id: Iacb08b64464cb93cbd8f34f2ec0308a77d40aab5
2014-07-25 17:48:55 -07:00
ztenghui
a95c8abb36 API REVIEW: VectorDrawable
- Merge <size> and <viewport> attributes all in to top-level <vector> tag
- Indent attributes under <group> in java doc.
- Updata android:stroke to be android:strokeColor, likewise android:fill
- Instead of android:clipToPath, make this a different clip-path tag.
- Document units of the various attributes
- Add example code for defining a VectorDrawable resource

More than that:
= Refactor the code to better support clipPath as a sub-class.
= Update all the xml files to use the new attributes and clip-path tag.

TODO:
-- Remove clipToPath, since that should happen on build break Friday.

bug:16488254

Change-Id: I6db5680ef83cb26c8f064a60fc7d6e7142974b0f
2014-07-25 23:26:41 +00:00
Alan Viverette
0ef12ae0a5 am aa7deddf: am 86706558: am e1af5ff0: Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev
* commit 'aa7deddf21ca2bf3b0f5175dc302f8c50dab31f9':
  Remove duplicate Toolbar method for setting content description
2014-07-25 20:21:19 +00:00
Jeff Sharkey
b64fd1957f am 891d3aa9: am a475ef57: am 4d700a9c: Merge "PackageInstaller changes based on feedback." into lmp-dev
* commit '891d3aa977653fb79f544f69fab2d214e58cd2b3':
  PackageInstaller changes based on feedback.
2014-07-25 19:25:10 +00:00
Yao Chen
c7e4229bda am 2efbbf29: am 8048a9f8: am 040ad25d: fix build
* commit '2efbbf29dae2e509b466162b732d8a8c95086833':
  fix build
2014-07-25 19:24:46 +00:00
Paul Soulos
bda303319b am d6e7338f: am 22a78a16: am 50655afc: Adds getTypeLabel to ContactsContract Event
* commit 'd6e7338f2ae25670e4b4ef4b7f9cda5ac9117449':
  Adds getTypeLabel to ContactsContract Event
2014-07-25 19:24:41 +00:00