Commit Graph

28432 Commits

Author SHA1 Message Date
Selim Gurun
e990e359f9 Add a delimiter between scheme and host
Bug: 6923539
Change-Id: Id5bbf44c90f9d0d5a468f3be3aa3e009a2ad3687
2013-03-08 11:14:12 -08:00
Adam Powell
15061d747d Merge "Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars" into jb-mr2-dev 2013-03-08 01:05:51 +00:00
Martijn Coenen
cbe9f48c25 Merge "Update NfcBarcode documentation for Kovio." into jb-mr2-dev 2013-03-07 23:05:40 +00:00
Martijn Coenen
7a6dfb2f72 Update NfcBarcode documentation for Kovio.
Change-Id: I4b6a452805c3dd68247dbe5493db14a263729615
2013-03-07 15:04:41 -08:00
Fabrice Di Meglio
617283c3c0 Merge "Fix bug #8217354 Suspicious behavior in RTL support for a RelativeLayout" into jb-mr2-dev 2013-03-07 22:49:38 +00:00
Scott Kennedy
b1b6efd082 Merge "Specify the size of the Map in the constructor" into jb-mr2-dev 2013-03-07 22:14:18 +00:00
Jeff Brown
3afc18af2c Enhance MediaRouter API.
The support library MediaRouter implementation needs a couple
of extra generally useful APIs in the platform MediaRouter to ensure
that it can safely synchronize its state.

Change-Id: I72c5652e10f3b6de48800abfa922affbefbd250f
2013-03-07 13:26:40 -08:00
Adam Powell
f158b52e20 Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars
While the inset scrollbars may change padding and how backgrounds are
drawn such that an otherwise opaque view is no longer opaque. However,
OUTSIDE_OVERLAY scrollbars don't change the padding and should not
affect the determination of opacity.

Change-Id: I8c0c1408aeb540813de3351f0c0d1ad12ba5919c
2013-03-07 12:40:04 -08:00
Robert Greenwalt
ccca3f39b3 Merge "Revert "Add default route constants to RouteInfo."" into jb-mr2-dev 2013-03-07 20:12:54 +00:00
Robert Greenwalt
7316cd83db Revert "Add default route constants to RouteInfo."
This reverts commit 642eb63a65

Change-Id: Ide6d7f3b935da41477b736ef0ef20ec9872563e1
2013-03-07 20:11:18 +00:00
Lorenzo Colitti
e33f43669f Merge "Add default route constants to RouteInfo." into jb-mr2-dev 2013-03-07 20:01:46 +00:00
Lorenzo Colitti
642eb63a65 Add default route constants to RouteInfo.
Bug: 8276725
Change-Id: I9c3ad7393430de9275f5b1c0189a94e5a27975fc
2013-03-07 11:08:08 -08:00
Jeff Sharkey
4861966cb2 Merge "ArrayUtils.indexOf(), containsAll() with tests." into jb-mr2-dev 2013-03-07 00:40:50 +00:00
Dianne Hackborn
1ab64b819b Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev 2013-03-07 00:34:55 +00:00
Jeff Sharkey
94c91dca55 ArrayUtils.indexOf(), containsAll() with tests.
Change-Id: I040164d4e45126e4a6c1df54bd114f47951da560
2013-03-06 16:28:36 -08:00
Dianne Hackborn
7caab0ff2d Add new sample code for writing a ViewGroup.
Change-Id: Id6714b062884c9ed60703e5c199f16683c00a800
2013-03-06 13:47:04 -08:00
Amith Yamasani
67df64b3a4 Shared accounts and sharing of apps
API and preliminary implementation for sharing primary user accounts with a secondary user.
AbstractAccountAuthenticator has new methods to retrieve and apply a bundle of credentials
to clone an account from the primary to a restricted secondary user. The AccountManagerService
initiates the account clone when it starts up the user and detects that the user has
a shared account registered that hasn't been converted to a real account.

AccountManager also has new hidden APIs to add/remove/get shared accounts. There might be
further improvements to this API to make shared accounts hidden/visible to select apps.

AccountManagerService has a new table to store the shared account information.

Added ability in PackageManager to install and uninstall packages for a secondary user. This
is required when the primary user selects a few apps to share with a restricted user.

Remove shared accounts from secondary users when primary user removes the account.

Change-Id: I9378ed0d8c1cc66baf150a4bec0ede56f6f8b06b
2013-03-06 09:49:44 -08:00
Przemyslaw Szczepaniak
7341786b13 Forgot to rename constructor to match class name.
Change-Id: I7e66c3dd26ec7f8be381b0dfd87ac686665206cd
2013-03-06 10:04:07 +00:00
Przemyslaw Szczepaniak
fcf671be89 Fix EBADF in TTS synthesizeToFile method.
Recent TTS change altered how the TextToSpeech.synthesizeToFile method
operates. Previously, synthesis service was responsible for creating
output file. Now, client API creates a file and then sends opened file
descriptor using ParcelFileDescriptor.

On service side, I forgot to keep a reference to a ParcelFileDescriptor object.
When GC was removing it, it was closing underlying file descriptor, resulting
in a EBADF error for all following writes to the output file.

This change makes use of a ParcelFileDescriptor.AutoCloseOutputStream to keep a
reference to the ParcelFileDescriptor. It will be referenced until we are done
with writing.

Change-Id: I8327af0eaeabaebfbbd8816d959783e89086a7c5
2013-03-06 09:27:11 +00:00
Mathias Agopian
f4d6f153e6 Merge "remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT" into jb-mr2-dev 2013-03-06 03:52:50 +00:00
Scott Kennedy
8ad7fbae87 Specify the size of the Map in the constructor
Change-Id: Ie3325f387cec72216cb70c1b764370e6f3dd1a3e
2013-03-05 19:46:43 -08:00
Victoria Lease
913f3c8f17 am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
* commit '263554ae5f51fe1181c0c80123ec7f489e124f1a':
  FIX Null Pointer Exception on dialog cancel
2013-03-05 23:53:48 +00:00
Victoria Lease
b2f91e7b23 am 8ef243cf: am f45efd27: Merge "Audio continue to played even if paused manually"
* commit '8ef243cf861044eec35ee3d8207561251e34c77c':
  Audio continue to played even if paused manually
2013-03-05 23:53:46 +00:00
Victoria Lease
263554ae5f am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b':
  FIX Null Pointer Exception on dialog cancel
2013-03-05 15:51:19 -08:00
Victoria Lease
8ef243cf86 am f45efd27: Merge "Audio continue to played even if paused manually"
* commit 'f45efd276c9b09adcb97ea43afc806731583aac7':
  Audio continue to played even if paused manually
2013-03-05 15:51:16 -08:00
Victoria Lease
7d4e52baee Merge "FIX Null Pointer Exception on dialog cancel" 2013-03-05 23:25:16 +00:00
Fabrice Di Meglio
5f51fd6970 Merge "Make Spinner widget RTL-aware (part 2)" into jb-mr2-dev 2013-03-05 22:23:33 +00:00
Fabrice Di Meglio
8e440a6c1a Merge "Improve RTL code for RelativeLayout" into jb-mr2-dev 2013-03-05 22:20:30 +00:00
Mathias Agopian
11e7d88d14 remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT
the window manager can now use the SurfaceControl.screenshot
API with a "regular" surface.

Change-Id: I76bed81d5e7b078ea1b3e8f96814aba32e9d5405
2013-03-05 14:14:55 -08:00
Fabrice Di Meglio
c44d880c50 Fix bug #8217354 Suspicious behavior in RTL support for a RelativeLayout
- make rules resolution follow the same pattern as padding and other
RTL properties

Change-Id: Ia0f460f188063f950bc311b51765fdec2f96f542
2013-03-05 14:10:23 -08:00
Scott Main
892b979478 am 47c59b48: am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '47c59b48357d875a6a0278e945e4c08700886b37':
  docs: clarify startActivity
2013-03-05 21:16:45 +00:00
Scott Main
47c59b4835 am 01798b05: am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '01798b0553ffd504b0012a8f3ffb7a8d3c1be641':
  docs: clarify startActivity
2013-03-05 13:13:48 -08:00
Fabrice Di Meglio
f80ceed450 Make Spinner widget RTL-aware (part 2)
See bug #8159072 Spinner widget should be RTL'ized

Change-Id: I3f9368f242a027852bf13a7ce4b760de1e1c2fb2
2013-03-05 13:12:13 -08:00
Scott Main
01798b0553 am 76d85763: am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '76d857639efa3e5fd01553a26b6742a6895d189f':
  docs: clarify startActivity
2013-03-05 13:09:44 -08:00
Fabrice Di Meglio
d5ffc79fc8 Improve RTL code for RelativeLayout
- instead of passing the screen size as a constant for computing the
layout size in RTL mode, we just use a real constant. Any value would
work actually, as soon as the value would not be null.

Change-Id: If9f5b38afa88938db36a795bfc8a403ad660726b
2013-03-05 13:07:08 -08:00
Scott Main
0f1259ccb7 am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs
* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity
2013-03-05 13:03:25 -08:00
Dianne Hackborn
a55136169e Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev 2013-03-05 17:37:43 +00:00
Dianne Hackborn
e3f23a36d8 Add new WindowId for cross-process monitoring of focus.
This is a class representing a window and providing limited
interaction with it, which can be handed across processes.

Change-Id: I22885f2064a9cc8c68d690a5858c2e28bbb6a0f3
2013-03-05 09:33:48 -08:00
Roger Chen
002ecd2122 Audio continue to played even if paused manually
Currently, audio will resume playing after a phone call
or notification even if the user had manually paused playback.

This patch addresses that by introducing a new player state
to distinguish the user pausing playback and the browser
losing audio focus for some other reason. Audio will only
 resume if the browser temporarily lost audio focus and
not when the user has manually paused playback.

Change-Id: I9e8beaedb0fcc5afe920068297ed9c387eab2ac8
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-03-05 13:05:34 +00:00
Romain Guy
d23b2747ef Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev 2013-03-05 03:11:11 +00:00
Romain Guy
e78b8003a5 Finish current Canvas operations then resume previous Canvas
Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
2013-03-04 19:08:02 -08:00
Mathias Agopian
188f8c5e4b Merge "screenshots can now go into a Surface from java" into jb-mr2-dev 2013-03-05 02:31:15 +00:00
Mathias Agopian
0449a40586 screenshots can now go into a Surface from java
A Surface can trivially be created from a SurfaceTexture.
Update ElectronBeam to use this new API.

Bug: 6940974
Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
2013-03-04 17:45:26 -08:00
Brian Carlstrom
42ca4975dc am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-05 00:56:05 +00:00
Christopher Tate
267097b00b DO NOT MERGE: Don't crash when we get a drag-ended after being detached
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

(Cherrypicked from downstream)

Bug 8298439

Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae
2013-03-04 14:02:29 -08:00
Ben Murdoch
4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 2013-03-04 19:40:55 +00:00
Brian Carlstrom
6f2adcf9ab am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
  Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-04 10:52:49 -08:00
Jeff Sharkey
2e0da1ea5f Merge "Improve performance of storage measurement." into jb-mr2-dev 2013-03-02 06:14:51 +00:00
Jeff Sharkey
237940a092 am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit '2048fbb1106a639c6b66298b94ab98eb4c650542':
  Tighten enforcement of file modes.
2013-03-01 17:31:54 -08:00
Jeff Sharkey
2048fbb110 am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
* commit 'c807070cb54228f1039cd0a3f2fe14efbe46df3e':
  Tighten enforcement of file modes.
2013-03-01 17:30:45 -08:00