Katie McCormick
484b57a565
am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
...
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
Doc updates: Javadoc fixes
2013-11-26 21:58:18 +00:00
Katie McCormick
f2ef28d840
Doc updates: Javadoc fixes
...
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
2013-11-26 13:52:48 -08:00
John Spurlock
e18b673a4d
am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs
...
* commit '330dfa7d11c542aa99aa277f75113bfc916d72dd':
Fix @see link in DocumentsContract docs.
2013-11-25 23:29:29 +00:00
John Spurlock
330dfa7d11
Merge "Fix @see link in DocumentsContract docs." into klp-docs
2013-11-25 23:25:36 +00:00
John Spurlock
4e55a7e8c5
Fix @see link in DocumentsContract docs.
...
DocumentsContract#createDocument is hidden.
Change-Id: Iae9c4bcd8620c5297d1fc4e2324a8a242ab4b31a
2013-11-25 18:00:07 -05:00
John Spurlock
56979b2234
am 125d133b: Fix bad @see links in Intent.java.
...
* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
Fix bad @see links in Intent.java.
2013-11-25 18:39:33 +00:00
John Spurlock
125d133bcc
Fix bad @see links in Intent.java.
...
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
2013-11-25 11:58:37 -05:00
Jeff Brown
263c431017
am ce468a35: Stop wifi display discovery when no longer needed.
...
* commit 'ce468a35b388ca46578934706b38dbae94941643':
Stop wifi display discovery when no longer needed.
2013-11-21 19:43:00 -08:00
Jeff Brown
ce468a35b3
Stop wifi display discovery when no longer needed.
...
Keep track of how many clients are requesting scans and scan
continuously until all of them are gone then explicitly terminate the
scan instead of letting it time out as before.
Suspend wifi display scans while connecting or connected to a remote
display. This is handled by both the display manager and media router
since neither has complete information about what is happening.
Much of this code will no longer be needed once wifi display support
is integrated directly into the media router service.
Ensure that we don't attempt to scan or connect to wifi displays
while the wifi display feature is off.
Infer when a connection attempt fails and unselect the wifi display
route automatically so it doesn't appear to be connecting forever.
Fix issues around correctly canceling and retrying connection attempts.
Often we would cancel but not retry.
Improved connection reliability somewhat. It seems that discovery must
already be in progress in order for a connection attempt to succeed.
Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
to determine when the remote display tile should be made visible.
Bug: 11717053
Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
2013-11-21 19:32:59 -08:00
Newton Allen
27bd44401e
am 28029658: Fix javadoc typo in SparseArray.
...
* commit '2802965888566244d8642ba32775b7b2a3cec655':
Fix javadoc typo in SparseArray.
2013-11-21 23:28:28 +00:00
Newton Allen
2802965888
Fix javadoc typo in SparseArray.
...
Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
(cherry picked from commit ebb47950f21d3c41955a591000dfb1f195e746fe)
2013-11-21 23:12:32 +00:00
Svetoslav Ganov
b95d6f549b
am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
...
* commit 'c6db9c3b371ed8a90fa064f0487440d8a1d8bd46':
Revert "PreferenceFragment showing the breadcrumb when not needed."
2013-11-21 12:15:22 -08:00
Svetoslav Ganov
4ed5f502a7
am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
...
* commit '4d159661f453fa5d04698033f4bf6256f0d3c16a':
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
2013-11-21 12:15:19 -08:00
Svetoslav Ganov
c6db9c3b37
Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev
2013-11-21 20:12:13 +00:00
Svetoslav Ganov
4d159661f4
Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev
2013-11-21 20:12:02 +00:00
Dirk Dougherty
a40420c9c1
am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs
...
* commit '43eea0a640db07c4da05146f7e68eae567592bdb':
Doc change: Change description for BRAND. Bug:11431921
2013-11-21 19:49:46 +00:00
Svetoslav Ganov
8fc552e695
Revert "PreferenceFragment showing the breadcrumb when not needed."
...
This reverts commit 7db97b0a29c613afb78c2734bf2504324a71963d.
Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3
2013-11-21 19:36:22 +00:00
Svetoslav Ganov
68e7f13e22
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
...
This reverts commit 2b8795a9db2d494c38d34fd113a9153880a555c0.
Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d
2013-11-21 19:33:53 +00:00
Geoff Mendal
35f097a7bf
Import translations. DO NOT MERGE
...
Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
Auto-generated-cl: translation import
2013-11-21 10:42:03 -08:00
Dirk Dougherty
491b40d752
Doc change: Change description for BRAND.
...
Bug:11431921
Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
2013-11-21 09:31:40 -08:00
Jeff Brown
d2a0192bf2
am b40ce4b8: Make action bar media router icons blue again.
...
* commit 'b40ce4b8e85b44c8dc190bdfac0106402102280b':
Make action bar media router icons blue again.
2013-11-20 16:48:52 -08:00
Jeff Brown
b40ce4b8e8
Make action bar media router icons blue again.
...
This partially reverts commit e7ae644522f692c204d0233f91e77c7841bdfe53.
Bug: 11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723
2013-11-20 15:27:43 -08:00
Baligh Uddin
853251e74f
Import translations. DO NOT MERGE
...
Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import
2013-11-20 09:17:20 -08:00
Christopher Tate
e370534267
am b0183f0a: Harden against transiently unavailable backup transports
...
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
Harden against transiently unavailable backup transports
2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3
Harden against transiently unavailable backup transports
...
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.
Now with 100% less build break.
Bug 11716868
Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
2013-11-19 11:24:46 -08:00
Sascha Prueter
c7f7d1bf18
am f7044fec: Merge "Trying to unbreak build..." into klp-dev
...
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
Trying to unbreak build...
2013-11-18 23:27:07 -08:00
Sascha Prueter
d5965cb506
Trying to unbreak build...
...
Revert "Harden against transiently unavailable backup transports"
This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.
Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
2013-11-19 06:51:21 +00:00
Christopher Tate
1e964ed808
am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
...
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
Harden against transiently unavailable backup transports
2013-11-18 18:44:47 -08:00
Christopher Tate
8f98252afe
Harden against transiently unavailable backup transports
...
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.
Bug 11716868
Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
2013-11-18 16:12:38 -08:00
Baligh Uddin
2337eb1b65
Import translations. DO NOT MERGE
...
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
2013-11-18 08:49:48 -08:00
Wink Saville
6797925686
am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev
...
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
Add config_restartRadioAfterProvisioning
2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803
Merge "Add config_restartRadioAfterProvisioning" into klp-dev
2013-11-15 19:35:05 +00:00
Wink Saville
9124d56acc
Add config_restartRadioAfterProvisioning
...
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
2013-11-15 08:27:53 -08:00
Jeff Brown
5d0b18cddf
am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
...
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
Disallow applications from initiating cast screen.
2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2
Merge "Disallow applications from initiating cast screen." into klp-dev
2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2
Disallow applications from initiating cast screen.
...
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.
As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.
Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
2013-11-15 00:29:43 -08:00
Mindy Pereira
cce2e1944c
am 5823352c: Cancel double tap mode on action_up
...
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
Cancel double tap mode on action_up
2013-11-14 19:44:52 -08:00
Mindy Pereira
5823352c6c
Cancel double tap mode on action_up
...
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag
Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
2013-11-15 02:48:06 +00:00
Christopher Tate
64397749ef
am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev
...
* commit '22010817b90f97756a76777fcd1dbe7e3b63e808':
Handle backup transport registration dynamically
2013-11-14 18:37:54 -08:00
Christopher Tate
22010817b9
Merge "Handle backup transport registration dynamically" into klp-dev
2013-11-15 02:34:38 +00:00
Christopher Tate
cefba58d14
Handle backup transport registration dynamically
...
Bug 11369873
Change-Id: I9bbdcc21ce25159c6645690123b5d03c553b0ddc
2013-11-14 18:13:25 -08:00
Jeff Brown
2bced6dcb5
am a7a46a66: Merge "Update cast screen strings." into klp-dev
...
* commit 'a7a46a66fa9f9ce547bac6c2e800a0ae287d9e5c':
Update cast screen strings.
2013-11-14 17:31:32 -08:00
Jeff Brown
a7a46a66fa
Merge "Update cast screen strings." into klp-dev
2013-11-15 01:28:59 +00:00
Jeff Brown
cef34fce3c
Update cast screen strings.
...
Bug: 11257292
Change-Id: Ia66152985bafcdd8ec88a3145623536a2b439b78
2013-11-14 16:03:36 -08:00
Christopher Tate
6e5cf573f2
am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
...
* commit '99437f252b728f4946940f232c4b73b9dda76cfb':
Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:04:31 -08:00
Christopher Tate
99437f252b
Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
2013-11-14 22:59:20 +00:00
Christopher Tate
ba629da331
Ensure recipient can be launched before attempting broadcast delivery
...
User removal or eviction inherently races with broadcast delivery. This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.
Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.
We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.
Bug 11652784
Bug 11272019
Bug 8263020
Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
2013-11-14 12:37:31 -08:00
Matthew Williams
09d8e3cf4e
am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
...
* commit 'c68bb18244aa12d19bea9f9d59f2fe0d81478904':
SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:23:32 -08:00
Matthew Williams
c68bb18244
Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
2013-11-14 17:18:58 +00:00
Satoshi Kataoka
1b570b571a
am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype
...
* commit '5fd5aa3d066fc12c92b5b6541d85ac243556223f':
Fix compatibility issue on InputMethodSubtype
2013-11-13 22:25:01 -08:00