OSDN Git Service

android-x86/frameworks-base.git
10 years agoNDK release notes for r9c for review
David Friedman [Tue, 26 Nov 2013 22:32:22 +0000 (14:32 -0800)]
NDK release notes for r9c for review

Staged at http://boku.mtv.corp.google.co:9196/tools/sdk/ndk/index.html

Change-Id: Id058d39e10ce64fff2def3dea746ac5e11eff2b4

10 years agoam 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs
Katie McCormick [Tue, 26 Nov 2013 19:09:52 +0000 (19:09 +0000)]
am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs

* commit '752d8029176d3670b9e817d8465d854d4a1b933e':
  Doc update: minor changes to immersive lesson

10 years agoMerge "Doc update: minor changes to immersive lesson" into klp-docs
Katie McCormick [Tue, 26 Nov 2013 19:06:06 +0000 (19:06 +0000)]
Merge "Doc update: minor changes to immersive lesson" into klp-docs

10 years agoam 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs
John Spurlock [Mon, 25 Nov 2013 23:29:29 +0000 (23:29 +0000)]
am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs

* commit '330dfa7d11c542aa99aa277f75113bfc916d72dd':
  Fix @see link in DocumentsContract docs.

10 years agoMerge "Fix @see link in DocumentsContract docs." into klp-docs
John Spurlock [Mon, 25 Nov 2013 23:25:36 +0000 (23:25 +0000)]
Merge "Fix @see link in DocumentsContract docs." into klp-docs

10 years agoFix @see link in DocumentsContract docs.
John Spurlock [Mon, 25 Nov 2013 23:00:07 +0000 (18:00 -0500)]
Fix @see link in DocumentsContract docs.

DocumentsContract#createDocument is hidden.

Change-Id: Iae9c4bcd8620c5297d1fc4e2324a8a242ab4b31a

10 years agoam 125d133b: Fix bad @see links in Intent.java.
John Spurlock [Mon, 25 Nov 2013 18:39:33 +0000 (18:39 +0000)]
am 125d133b: Fix bad @see links in Intent.java.

* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
  Fix bad @see links in Intent.java.

10 years agoam 7a4adedf: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 18:37:07 +0000 (10:37 -0800)]
am 7a4adedf: (-s ours) Import translations. DO NOT MERGE

* commit '7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 17:42:45 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
Auto-generated-cl: translation import

10 years agoFix bad @see links in Intent.java.
John Spurlock [Mon, 25 Nov 2013 16:58:37 +0000 (11:58 -0500)]
Fix bad @see links in Intent.java.

Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293

10 years agoam 6000f1ed: Re-enable samples browser.
Dirk Dougherty [Sat, 23 Nov 2013 20:28:04 +0000 (20:28 +0000)]
am 6000f1ed: Re-enable samples browser.

* commit '6000f1ed3d402e3136df173d987c901cc3cc1ff2':
  Re-enable samples browser.

10 years agoRe-enable samples browser.
Dirk Dougherty [Fri, 22 Nov 2013 22:01:48 +0000 (14:01 -0800)]
Re-enable samples browser.

Change-Id: I9d0c5966422ba0cf8bca576895f30679d40a19ab

10 years agoam 9eaa9443: Disable samples browsing temporarily.
Dirk Dougherty [Fri, 22 Nov 2013 18:55:28 +0000 (18:55 +0000)]
am 9eaa9443: Disable samples browsing temporarily.

* commit '9eaa94439121f6cb03bff8ecf0acbcbc74442f2d':
  Disable samples browsing temporarily.

10 years agoDisable samples browsing temporarily.
Dirk Dougherty [Fri, 22 Nov 2013 18:46:22 +0000 (10:46 -0800)]
Disable samples browsing temporarily.

Change-Id: I65fe533f1b43903d6605d17691ec142d062b6b5e

10 years agoam 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point...
Dirk Dougherty [Fri, 22 Nov 2013 18:38:20 +0000 (18:38 +0000)]
am 1448d3cd: Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs

* commit '1448d3cd81a685c68b0102e8303c0db4e6e5668f':
  Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.

10 years agoMerge "Pass a new samplesdir param to doclava as the starting point for generating...
Dirk Dougherty [Fri, 22 Nov 2013 18:36:03 +0000 (18:36 +0000)]
Merge "Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration." into klp-docs

10 years agoam ce468a35: Stop wifi display discovery when no longer needed.
Jeff Brown [Fri, 22 Nov 2013 03:43:00 +0000 (19:43 -0800)]
am ce468a35: Stop wifi display discovery when no longer needed.

* commit 'ce468a35b388ca46578934706b38dbae94941643':
  Stop wifi display discovery when no longer needed.

10 years agoStop wifi display discovery when no longer needed.
Jeff Brown [Fri, 22 Nov 2013 00:42:03 +0000 (16:42 -0800)]
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

10 years agoPass a new samplesdir param to doclava as the starting point for generating samples...
Dirk Dougherty [Fri, 22 Nov 2013 02:11:58 +0000 (18:11 -0800)]
Pass a new samplesdir param to doclava as the starting point for generating samples browsing files. Removes older project-based configuration.

Change-Id: If59372a92f0572d54af0f2ed7f9f9e401fbce067

10 years agoam 28029658: Fix javadoc typo in SparseArray.
Newton Allen [Thu, 21 Nov 2013 23:28:28 +0000 (23:28 +0000)]
am 28029658: Fix javadoc typo in SparseArray.

* commit '2802965888566244d8642ba32775b7b2a3cec655':
  Fix javadoc typo in SparseArray.

10 years agoFix javadoc typo in SparseArray.
Newton Allen [Thu, 21 Nov 2013 21:27:10 +0000 (13:27 -0800)]
Fix javadoc typo in SparseArray.

Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35
(cherry picked from commit ebb47950f21d3c41955a591000dfb1f195e746fe)

10 years agoam 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar...
Dianne Hackborn [Thu, 21 Nov 2013 22:08:00 +0000 (14:08 -0800)]
am 90e9b1d3: Fix issue #11790471: Crash removed home buttons and notification bar/shade

* commit '90e9b1d3dc15e97bb7ecb88289c3707fe03fb1a6':
  Fix issue #11790471: Crash removed home buttons and notification bar/shade

10 years agoFix issue #11790471: Crash removed home buttons and notification bar/shade
Dianne Hackborn [Thu, 21 Nov 2013 20:50:01 +0000 (12:50 -0800)]
Fix issue #11790471: Crash removed home buttons and notification bar/shade

Whoops persistent processes are, well, persistent.  Don't remove
services from them.  We'll be keeping that process record around.

Change-Id: I29e9fb6f704efdf0caad5e0307a7adbb416eed3b

10 years agoam c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed...
Svetoslav Ganov [Thu, 21 Nov 2013 20:15:22 +0000 (12:15 -0800)]
am c6db9c3b: Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev

* commit 'c6db9c3b371ed8a90fa064f0487440d8a1d8bd46':
  Revert "PreferenceFragment showing the breadcrumb when not needed."

10 years agoam 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single...
Svetoslav Ganov [Thu, 21 Nov 2013 20:15:19 +0000 (12:15 -0800)]
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."

10 years agoMerge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into...
Svetoslav Ganov [Thu, 21 Nov 2013 20:12:12 +0000 (20:12 +0000)]
Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev

10 years agoMerge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode...
Svetoslav Ganov [Thu, 21 Nov 2013 20:12:02 +0000 (20:12 +0000)]
Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev

10 years agoam 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into...
Dirk Dougherty [Thu, 21 Nov 2013 19:49:46 +0000 (19:49 +0000)]
am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs

* commit '43eea0a640db07c4da05146f7e68eae567592bdb':
  Doc change: Change description for BRAND. Bug:11431921

10 years agoMerge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs
Dirk Dougherty [Thu, 21 Nov 2013 19:45:45 +0000 (19:45 +0000)]
Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs

10 years agoRevert "PreferenceFragment showing the breadcrumb when not needed."
Svetoslav Ganov [Thu, 21 Nov 2013 19:36:22 +0000 (19:36 +0000)]
Revert "PreferenceFragment showing the breadcrumb when not needed."

This reverts commit 7db97b0a29c613afb78c2734bf2504324a71963d.

Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3

10 years agoRevert "PreferencesFragment showing the breadcrumb area in single pane mode."
Svetoslav Ganov [Thu, 21 Nov 2013 19:33:53 +0000 (19:33 +0000)]
Revert "PreferencesFragment showing the breadcrumb area in single pane mode."

This reverts commit 2b8795a9db2d494c38d34fd113a9153880a555c0.

Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d

10 years agoam 4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs
Katie McCormick [Thu, 21 Nov 2013 19:29:32 +0000 (19:29 +0000)]
am 4181da02: Merge "Doc update: Minor additions to storage doc" into klp-docs

* commit '4181da02966255cc50e6a0af3e9fba38812abc8a':
  Doc update: Minor additions to storage doc

10 years agoMerge "Doc update: Minor additions to storage doc" into klp-docs
Katie McCormick [Thu, 21 Nov 2013 19:26:36 +0000 (19:26 +0000)]
Merge "Doc update: Minor additions to storage doc" into klp-docs

10 years agoDoc update: Minor additions to storage doc
Katie McCormick [Wed, 13 Nov 2013 02:42:08 +0000 (18:42 -0800)]
Doc update: Minor additions to storage doc

Change-Id: I59aa961a94393221be3c5f847a9fc82aa43e3a6f

10 years agoam 35f097a7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 18:53:28 +0000 (10:53 -0800)]
am 35f097a7: (-s ours) Import translations. DO NOT MERGE

* commit '35f097a7bf4f30d0006221e9ae376ab85ab6937a':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 18:42:03 +0000 (10:42 -0800)]
Import translations. DO NOT MERGE

Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
Auto-generated-cl: translation import

10 years agoam 58c168a1: Merge "Doc change: update download progress image." into klp-docs
Dirk Dougherty [Thu, 21 Nov 2013 18:29:38 +0000 (18:29 +0000)]
am 58c168a1: Merge "Doc change: update download progress image." into klp-docs

* commit '58c168a1b934c61472176d6de3cfa8996953126c':
  Doc change: update download progress image.

10 years agoMerge "Doc change: update download progress image." into klp-docs
Dirk Dougherty [Thu, 21 Nov 2013 18:26:05 +0000 (18:26 +0000)]
Merge "Doc change: update download progress image." into klp-docs

10 years agoDoc change: update download progress image.
Dirk Dougherty [Thu, 21 Nov 2013 17:49:40 +0000 (09:49 -0800)]
Doc change: update download progress image.

Change-Id: Ib0a4a00cc69a5fa6c552f70aaf40a682e539c41e

10 years agoDoc change: Change description for BRAND.
Dirk Dougherty [Wed, 30 Oct 2013 01:33:29 +0000 (18:33 -0700)]
Doc change: Change description for BRAND.
Bug:11431921

Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575

10 years agoam b40ce4b8: Make action bar media router icons blue again.
Jeff Brown [Thu, 21 Nov 2013 00:48:52 +0000 (16:48 -0800)]
am b40ce4b8: Make action bar media router icons blue again.

* commit 'b40ce4b8e85b44c8dc190bdfac0106402102280b':
  Make action bar media router icons blue again.

10 years agoam 93fd2d0e: add Google+ links to support page bug: 7143885
Scott Main [Thu, 21 Nov 2013 00:29:41 +0000 (00:29 +0000)]
am 93fd2d0e: add Google+ links to support page bug: 7143885

* commit '93fd2d0ea771e08f5ae124120875fb779010b87a':
  add Google+ links to support page bug: 7143885

10 years agoadd Google+ links to support page
Scott Main [Wed, 20 Nov 2013 23:33:33 +0000 (15:33 -0800)]
add Google+ links to support page
bug: 7143885

Change-Id: I200d7b84694169e5adf2d13a0b6f2c56ab76a727

10 years agoMake action bar media router icons blue again.
Jeff Brown [Wed, 20 Nov 2013 23:27:14 +0000 (15:27 -0800)]
Make action bar media router icons blue again.

This partially reverts commit e7ae644522f692c204d0233f91e77c7841bdfe53.

Bug: 11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723

10 years agoam bfdecccc: Merge "Only scan for wifi display when there is no active connections...
Chong Zhang [Wed, 20 Nov 2013 22:27:44 +0000 (14:27 -0800)]
am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev

* commit 'bfdecccc48ef2fd9bfb19d77be2492f22971fed9':
  Only scan for wifi display when there is no active connections

10 years agoMerge "Only scan for wifi display when there is no active connections" into klp-dev
Chong Zhang [Wed, 20 Nov 2013 22:24:20 +0000 (22:24 +0000)]
Merge "Only scan for wifi display when there is no active connections" into klp-dev

10 years agoam bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 20 Nov 2013 21:11:58 +0000 (13:11 -0800)]
am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'bc77af5b4c2161d7bc1e2de7dc472f343d7f9581':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 20 Nov 2013 21:08:31 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 3aec4328: add Analytics event tracking for Studio download
Scott Main [Wed, 20 Nov 2013 21:02:38 +0000 (21:02 +0000)]
am 3aec4328: add Analytics event tracking for Studio download

* commit '3aec4328da1e02993517ddc9c119aca24c7ce680':
  add Analytics event tracking for Studio download

10 years agoadd Analytics event tracking for Studio download
Scott Main [Wed, 20 Nov 2013 20:51:28 +0000 (12:51 -0800)]
add Analytics event tracking for Studio download

Change-Id: I85c2db10d431f32316eabdae5d37e03afd7e83bf

10 years agoam 64fedb77: add new video button to some pages
Scott Main [Wed, 20 Nov 2013 20:39:15 +0000 (20:39 +0000)]
am 64fedb77: add new video button to some pages

* commit '64fedb7725f082ce6bde94c3599d2e7c203ae077':
  add new video button to some pages

10 years agoadd new video button to some pages
Scott Main [Tue, 12 Nov 2013 17:12:38 +0000 (09:12 -0800)]
add new video button to some pages

Change-Id: Ie1f1875d041ff662aee709cd5f7d3110e438d0d5

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 17:50:34 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE

Change-Id: I499aa31a9f0e9a997d5e60eb778f16bc3b497663
Auto-generated-cl: translation import

10 years agoam 853251e7: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 17:37:51 +0000 (09:37 -0800)]
am 853251e7: (-s ours) Import translations. DO NOT MERGE

* commit '853251e74f3e603f3431a3317b4d27ee042a4eb1':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 17:17:20 +0000 (09:17 -0800)]
Import translations. DO NOT MERGE

Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import

10 years agoOnly scan for wifi display when there is no active connections
Chong Zhang [Wed, 20 Nov 2013 03:13:22 +0000 (19:13 -0800)]
Only scan for wifi display when there is no active connections

Bug: 11717053
Change-Id: I4ab73f6517fbfb8fcc131b89d0e934380dcf69e0

10 years agoam acca12fa: Merge "Doc change: move localized files into an intl dir. Build output...
Dirk Dougherty [Wed, 20 Nov 2013 02:16:21 +0000 (02:16 +0000)]
am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs

* commit 'acca12faea5fc1c9de63fdc08ae4d6bc0bad864a':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

10 years agoMerge "Doc change: move localized files into an intl dir. Build output remains the...
Dirk Dougherty [Wed, 20 Nov 2013 02:13:48 +0000 (02:13 +0000)]
Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs

10 years agoDoc change: move localized files into an intl dir. Build output remains the same...
Dirk Dougherty [Tue, 19 Nov 2013 21:15:07 +0000 (13:15 -0800)]
Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.

Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527

10 years agoam 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs
Katie McCormick [Wed, 20 Nov 2013 01:10:37 +0000 (01:10 +0000)]
am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs

* commit '39711934023b088887a08d833674170938f82a7d':
  Doc update: redo of new API Console steps.

10 years agoMerge "Doc update: redo of new API Console steps." into klp-docs
Katie McCormick [Wed, 20 Nov 2013 01:07:56 +0000 (01:07 +0000)]
Merge "Doc update: redo of new API Console steps." into klp-docs

10 years agoDoc update: redo of new API Console steps.
Katie McCormick [Sat, 16 Nov 2013 00:02:58 +0000 (16:02 -0800)]
Doc update: redo of new API Console steps.

Fixes for:

b/11713745
b/11712882
b/10669388
b/10641901

Change-Id: I071eba31d51f0e29b9be4a7f7ede0f01c7a52838

10 years agoam b0183f0a: Harden against transiently unavailable backup transports
Christopher Tate [Tue, 19 Nov 2013 19:46:48 +0000 (11:46 -0800)]
am b0183f0a: Harden against transiently unavailable backup transports

* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports

10 years agoHarden against transiently unavailable backup transports
Christopher Tate [Mon, 18 Nov 2013 22:20:36 +0000 (14:20 -0800)]
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

10 years agoam de4a8d85: Merge "Systrace doc updates" into klp-docs
Joe Fernandez [Tue, 19 Nov 2013 19:12:24 +0000 (19:12 +0000)]
am de4a8d85: Merge "Systrace doc updates" into klp-docs

* commit 'de4a8d851b18ac032f044fa39e5db2529dd33911':
  Systrace doc updates

10 years agoMerge "Systrace doc updates" into klp-docs
Joe Fernandez [Tue, 19 Nov 2013 19:09:05 +0000 (19:09 +0000)]
Merge "Systrace doc updates" into klp-docs

10 years agoSystrace doc updates
Joe Fernandez [Mon, 16 Sep 2013 18:31:25 +0000 (11:31 -0700)]
Systrace doc updates

Update to reflect new user interface and command line options
in Android 4.3+. Also add section on using application-level
tracing.

Fixes for bugs:
b/7306847
b/10113361
b/9425766
b/7306847
b/9262485

Change-Id: Ia1c2a54fa2edc12cd68da27055aebe7ec47df745

10 years agoam c04aa87e: Merge "Fix incorrent page range parsing when custom print options used...
Dave Langemak [Tue, 19 Nov 2013 16:34:57 +0000 (08:34 -0800)]
am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.

10 years agoam 096de3c3: Merge "Notify apps when insets change." into klp-dev
Craig Mautner [Tue, 19 Nov 2013 16:34:53 +0000 (08:34 -0800)]
am 096de3c3: Merge "Notify apps when insets change." into klp-dev

* commit '096de3c3017bb9b9e5e1ed9ad790b7fedab95433':
  Notify apps when insets change.

10 years agoMerge "Fix incorrent page range parsing when custom print options used." into klp-dev
Dave Langemak [Tue, 19 Nov 2013 16:33:22 +0000 (16:33 +0000)]
Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

10 years agoMerge "Notify apps when insets change." into klp-dev
Craig Mautner [Tue, 19 Nov 2013 16:31:59 +0000 (16:31 +0000)]
Merge "Notify apps when insets change." into klp-dev

10 years agoam 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev
Jeff Sharkey [Tue, 19 Nov 2013 08:11:15 +0000 (00:11 -0800)]
am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev

* commit '6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829':
  Mask OOBE when filtering recent documents.

10 years agoMerge "Mask OOBE when filtering recent documents." into klp-dev
Jeff Sharkey [Tue, 19 Nov 2013 08:08:12 +0000 (08:08 +0000)]
Merge "Mask OOBE when filtering recent documents." into klp-dev

10 years agoam f7044fec: Merge "Trying to unbreak build..." into klp-dev
Sascha Prueter [Tue, 19 Nov 2013 07:27:07 +0000 (23:27 -0800)]
am f7044fec: Merge "Trying to unbreak build..." into klp-dev

* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...

10 years agoMerge "Trying to unbreak build..." into klp-dev
Sascha Prueter [Tue, 19 Nov 2013 07:23:34 +0000 (07:23 +0000)]
Merge "Trying to unbreak build..." into klp-dev

10 years agoTrying to unbreak build...
Sascha Prueter [Tue, 19 Nov 2013 06:51:21 +0000 (06:51 +0000)]
Trying to unbreak build...

Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a

10 years agoam d6bbc544: Merge "Harden against transiently unavailable backup transports" into...
Christopher Tate [Tue, 19 Nov 2013 02:44:47 +0000 (18:44 -0800)]
am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev

* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports

10 years agoMerge "Harden against transiently unavailable backup transports" into klp-dev
Christopher Tate [Tue, 19 Nov 2013 02:41:54 +0000 (02:41 +0000)]
Merge "Harden against transiently unavailable backup transports" into klp-dev

10 years agoMask OOBE when filtering recent documents.
Jeff Sharkey [Tue, 19 Nov 2013 01:41:33 +0000 (17:41 -0800)]
Mask OOBE when filtering recent documents.

There is a data ownership issue related to recent documents Cursors,
and the loader and UI threads can end up traversing the same Cursor
at runtime.  This change masks OOBE crashes caused by this race until
we have time to fix cleanly.

Bug: 11736668
Change-Id: I2039a5edcf341fcaedacc2f08bde96fc5a271782

10 years agoam ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs
Dirk Dougherty [Tue, 19 Nov 2013 01:33:25 +0000 (01:33 +0000)]
am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs

* commit 'ce3f3a8d35a4fb23c907937cb8283532e321c8ad':
  Add link to HCE dev guide.

10 years agoMerge "Add link to HCE dev guide." into klp-docs
Dirk Dougherty [Tue, 19 Nov 2013 01:30:53 +0000 (01:30 +0000)]
Merge "Add link to HCE dev guide." into klp-docs

10 years agoNotify apps when insets change.
Craig Mautner [Mon, 18 Nov 2013 20:59:05 +0000 (12:59 -0800)]
Notify apps when insets change.

Activities that handle their own configuration get layout when hidden
and the configuration changes but not when the content insets change
if they are hidden. They need to get a fresh layout for both
situations.

Fixes bug 11544694.

Change-Id: Iff3a9adb72ea7dfc3e5cd38e1b9cd7cf2006f8f5

10 years agoam 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Tue, 19 Nov 2013 00:22:41 +0000 (16:22 -0800)]
am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

* commit '9d5a9434d3fe65d32aae0a400502dde8357f0ec7':
  Update ICU_Delegate methods. DO NOT MERGE

10 years agoMerge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Tue, 19 Nov 2013 00:19:01 +0000 (00:19 +0000)]
Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

10 years agoHarden against transiently unavailable backup transports
Christopher Tate [Mon, 18 Nov 2013 22:20:36 +0000 (14:20 -0800)]
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

10 years agoam abb4d2da: Doc change: edit line length above button.
Dirk Dougherty [Mon, 18 Nov 2013 23:49:48 +0000 (23:49 +0000)]
am abb4d2da: Doc change: edit line length above button.

* commit 'abb4d2da4374eb5e5e7a750e4b60a9145b1b1058':
  Doc change: edit line length above button.

10 years agoDoc change: edit line length above button.
Dirk Dougherty [Mon, 18 Nov 2013 23:45:30 +0000 (15:45 -0800)]
Doc change: edit line length above button.

Change-Id: I7fd5c192b93846e91e0069c287776996c3f01ab8

10 years agoDoc update: minor changes to immersive lesson
Katie McCormick [Mon, 18 Nov 2013 19:02:42 +0000 (11:02 -0800)]
Doc update: minor changes to immersive lesson

Change-Id: I4b830b1de6f92c7f5f0f1106f2f797bb891d73e2

10 years agoam 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
Adam Lesinski [Mon, 18 Nov 2013 21:29:25 +0000 (13:29 -0800)]
am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev

* commit '245408d29018fee4b1231e52f5da1edcc3283c4a':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc

10 years agoMerge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev
Adam Lesinski [Mon, 18 Nov 2013 21:26:32 +0000 (21:26 +0000)]
Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev

10 years agoam afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
John Spurlock [Mon, 18 Nov 2013 20:52:58 +0000 (12:52 -0800)]
am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev

* commit 'afc76f28b93f931069bb58c4f9b524d5a99b1604':
  Use scaled display size in wallpaper constraint.

10 years agoMerge "Use scaled display size in wallpaper constraint." into klp-dev
John Spurlock [Mon, 18 Nov 2013 20:49:16 +0000 (20:49 +0000)]
Merge "Use scaled display size in wallpaper constraint." into klp-dev

10 years agoDo not hold direct ref BatteryStatsImpl$Uid$Proc
Adam Lesinski [Mon, 18 Nov 2013 20:23:26 +0000 (12:23 -0800)]
Do not hold direct ref BatteryStatsImpl$Uid$Proc

BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.

bug:11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209

10 years agoUse scaled display size in wallpaper constraint.
John Spurlock [Mon, 18 Nov 2013 19:14:49 +0000 (14:14 -0500)]
Use scaled display size in wallpaper constraint.

Bug:11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449

10 years agoam 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:53:25 +0000 (10:53 -0800)]
am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '35fb6cdf14549dac07585ae791b27e2c069bf176':
  Import translations. DO NOT MERGE

10 years agoam d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:53:21 +0000 (10:53 -0800)]
am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'd7b4052049cba6c793367f6b5a8c3837f06faf1e':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:51:24 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 18 Nov 2013 18:51:00 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
Robert Greenwalt [Mon, 18 Nov 2013 18:29:51 +0000 (10:29 -0800)]
am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService

10 years agoMerge "Fix NPE in ConnectivityService" into klp-dev
Robert Greenwalt [Mon, 18 Nov 2013 18:27:23 +0000 (18:27 +0000)]
Merge "Fix NPE in ConnectivityService" into klp-dev