OSDN Git Service

android-x86/frameworks-base.git
8 years agodocs: Fix attr link in support lib docs. am: eea825d67e am: 252b996fee
Michael Wright [Wed, 18 May 2016 18:34:10 +0000 (18:34 +0000)]
docs: Fix attr link in support lib docs. am: eea825d67e am: 252b996fee
am: 97fd87bd5f

* commit '97fd87bd5fbe4ccc1cca4f3eda2df7006fefecf3':
  docs: Fix attr link in support lib docs.

Change-Id: I5b502a43efade5c85c8cd625e3d26f6200140362

8 years agodocs: Fix attr link in support lib docs. am: eea825d67e
Michael Wright [Wed, 18 May 2016 18:29:03 +0000 (18:29 +0000)]
docs: Fix attr link in support lib docs. am: eea825d67e
am: 252b996fee

* commit '252b996feea8b9d5c9c0101ca35753099feba15a':
  docs: Fix attr link in support lib docs.

Change-Id: I0164d7eed51b156767ddabc63804044db9e54be4

8 years agodocs: Fix attr link in support lib docs.
Michael Wright [Wed, 18 May 2016 18:21:55 +0000 (18:21 +0000)]
docs: Fix attr link in support lib docs.
am: eea825d67e

* commit 'eea825d67e271ac4adc48fd696d8cf7f4cbe0dc5':
  docs: Fix attr link in support lib docs.

Change-Id: I5901dcbd2ed759ea559dc071309329eb008950dc

8 years agodocs: Fix attr link in support lib docs.
Michael Wright [Wed, 18 May 2016 14:58:39 +0000 (15:58 +0100)]
docs: Fix attr link in support lib docs.

This issue was breaking the build in nyc-docs; Michael made the fix
there, so I'm cherrypicking it back to our doc branches.

Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
(cherry picked from commit ae316f842431254ce364cda4f1edde6fe607ab43)

8 years agodocs: Quick release-notes fix am: 29329dd3f1
Andrew Solovay [Wed, 18 May 2016 18:08:18 +0000 (18:08 +0000)]
docs: Quick release-notes fix am: 29329dd3f1
am: 1f279c1ab0

* commit '1f279c1ab030fb78ba193d9b91999bc8d98ae300':
  docs: Quick release-notes fix

Change-Id: Ic785186da0288b565c5ee4fca4b748290aa640e7

8 years agodocs: Quick release-notes fix
Andrew Solovay [Wed, 18 May 2016 18:04:08 +0000 (18:04 +0000)]
docs: Quick release-notes fix
am: 29329dd3f1

* commit '29329dd3f154bf33f1a2c85b0f49ad232d6f1dcc':
  docs: Quick release-notes fix

Change-Id: If1c368952b60be8df8457c38e4d4e7a4ac22e525

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 18 May 2016 17:57:25 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 18 May 2016 17:57:17 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 18 May 2016 17:54:32 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agodocs: Downloads change for \'I\' build am: 90433cf4d8
Bert McMeen [Wed, 18 May 2016 17:37:17 +0000 (17:37 +0000)]
docs: Downloads change for \'I\' build am: 90433cf4d8
am: 996c9839d6

* commit '996c9839d657ddb98c5c69f902cd33d45bea7663':
  docs: Downloads change for 'I' build

Change-Id: I027756f3e51efdd81e01f2a2fbe268044ca3c9b5

8 years agodocs: Downloads change for \'I\' build
Bert McMeen [Wed, 18 May 2016 17:32:01 +0000 (17:32 +0000)]
docs: Downloads change for \'I\' build
am: 90433cf4d8

* commit '90433cf4d8de469568202a7ca15a14d76db73f2a':
  docs: Downloads change for 'I' build

Change-Id: I9230b82f48d391245882150af67c949e6ae102dc

8 years agodocs: Quick release-notes fix
Andrew Solovay [Wed, 18 May 2016 17:29:52 +0000 (10:29 -0700)]
docs: Quick release-notes fix

DD asked to pull this sentence out. See first comment for doc stage
location, but if it builds and stages without trouble I'll go ahead
and submit.

Change-Id: Ie9844cf60bfd723dea8dbfd42eb04465dde84ae3

8 years agoMerge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
TreeHugger Robot [Wed, 18 May 2016 17:09:44 +0000 (17:09 +0000)]
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev

8 years agoShould check isDeviceSecure in shouldConfirmCredentials
Tony Mak [Tue, 17 May 2016 15:36:14 +0000 (16:36 +0100)]
Should check isDeviceSecure in shouldConfirmCredentials

The NPE is because createConfirmDeviceCredentialIntent returns a null
intent when it founds that user does not set a secure lock.
So the fix is we should check is the user set a secure lock screen as well.

The reason the crash only happens in multi-window flow because
we have null checking in
the normal flow (i.e. interceptWithConfirmCredentialsIfNeeded).
But I think we better check it explicitly.

Bug: 28716456
Change-Id: Ib204cd02c0007bd1df36908bb3b5254ec4ffb914

8 years agoMerge "Ensure background is shown behind gear when notifications overlap" into nyc-dev
Mady Mellor [Wed, 18 May 2016 16:43:11 +0000 (16:43 +0000)]
Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev

8 years agodocs: Downloads change for 'I' build
Bert McMeen [Wed, 18 May 2016 16:34:09 +0000 (09:34 -0700)]
docs: Downloads change for 'I' build

Bug: 28833659
Change-Id: Ifd5865d78960a58a6e8238225bc206978e84eb8f

8 years agoMerge "Use batching to set firewall rules." into nyc-dev
TreeHugger Robot [Wed, 18 May 2016 16:26:43 +0000 (16:26 +0000)]
Merge "Use batching to set firewall rules." into nyc-dev

8 years agoMerge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev
Jaewan Kim [Wed, 18 May 2016 15:46:45 +0000 (15:46 +0000)]
Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev

8 years agoMerge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
Robert Sesek [Wed, 18 May 2016 15:25:40 +0000 (15:25 +0000)]
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev

8 years agoMerge "Handle printers selected by SelectPrinter activity" into nyc-dev
Philip P. Moltmann [Wed, 18 May 2016 15:24:20 +0000 (15:24 +0000)]
Merge "Handle printers selected by SelectPrinter activity" into nyc-dev

8 years agodocs: Add redirect for Android Device Monitor and change redirects for Virtual Device...
Cheryl Potter [Wed, 18 May 2016 15:22:34 +0000 (15:22 +0000)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74
am: d45800d2e3

* commit 'd45800d2e31550520dd6f3210b309ae3abaa4471':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: Id7298a4811e157030f51646618b600a13a65ad77

8 years agodocs: Add redirect for Android Device Monitor and change redirects for Virtual Device...
Cheryl Potter [Wed, 18 May 2016 15:17:44 +0000 (15:17 +0000)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616
am: 06c815fc74

* commit '06c815fc74de27e7ca053f81c8972e268810de13':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I9597dba7e1f5c13c88dc1f3d2ba516418d679260

8 years agodocs: Add redirect for Android Device Monitor and change redirects for Virtual Device...
Cheryl Potter [Wed, 18 May 2016 15:11:54 +0000 (15:11 +0000)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592
am: d1da82f616

* commit 'd1da82f61614388c181ccbc9d4de2cfb6522c071':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I0c2acc2d5204d34c177b534d7dd4b5ae5200f98f

8 years agoMerge changes from topic 'bad-attr-buildfix' into nyc-dev
Michael Wright [Wed, 18 May 2016 15:07:36 +0000 (15:07 +0000)]
Merge changes from topic 'bad-attr-buildfix' into nyc-dev

* changes:
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""

8 years agoMerge "PackageManager: Fix reference profile canonicalization." into nyc-dev
Narayan Kamath [Wed, 18 May 2016 15:04:18 +0000 (15:04 +0000)]
Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev

8 years agoFix attr link in support lib docs.
Michael Wright [Wed, 18 May 2016 14:58:39 +0000 (15:58 +0100)]
Fix attr link in support lib docs.

It accidentally pointed to the media router resources rather than the
app compat ones.

Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0

8 years agoRevert "Revert "docs: Creating new support library revision history page""
Michael Wright [Wed, 18 May 2016 14:24:36 +0000 (15:24 +0100)]
Revert "Revert "docs: Creating new support library revision history page""

This reverts commit 982fd043357759bfdf619bc24f3a5f4366a3aac0.

8 years agoMerge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev
Julia Reynolds [Wed, 18 May 2016 14:09:49 +0000 (14:09 +0000)]
Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev

8 years agoPackageManager: Fix reference profile canonicalization.
Narayan Kamath [Mon, 16 May 2016 16:34:48 +0000 (17:34 +0100)]
PackageManager: Fix reference profile canonicalization.

Foreign dex markers are named in the runtime by calling realpath(3) on the input
dexfile path and replacing "/" with "@". On the Java side, we're using
File.getCanonicalPath, which is similar but isn't quite the same. It tries
to call realpath() directly, but if that fails, it resorts to a series of
increasingly desperate measures to calculate a "canonical path". We just
use realpath instead.

Also, don't attempt to delete a profile if canonicalization fails.

bug: 28740848
Change-Id: Ie5d5af590187e793db633342a42b923865e5c005

8 years agoMerge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev
Nicolas Prévot [Wed, 18 May 2016 11:21:44 +0000 (11:21 +0000)]
Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev

8 years agoRevert "docs: Creating new support library revision history page"
Bart Sears [Wed, 18 May 2016 07:19:31 +0000 (07:19 +0000)]
Revert "docs: Creating new support library revision history page"

This reverts commit 09e9d24bcf9d80c3946fdbf0989bade053466d35.

Change-Id: Idbece8b39491eea7e2324916a5a88f08f2623f1f

8 years agoMerge "docs: Pages for Instant Apps" into mnc-io-docs am: ad1639e276
Joe Fernandez [Wed, 18 May 2016 07:15:09 +0000 (07:15 +0000)]
Merge "docs: Pages for Instant Apps" into mnc-io-docs am: ad1639e276
am: 24d753f134

* commit '24d753f134b8da8b1f3d2f764f48f8d66e9a0164':
  docs: Pages for Instant Apps

Change-Id: Ic0fadeb9c32152ca9366f7e7a86fae008e49cad7

8 years agoMerge "docs: Pages for Instant Apps" into mnc-io-docs
Eric Schmidt [Wed, 18 May 2016 07:10:14 +0000 (07:10 +0000)]
Merge "docs: Pages for Instant Apps" into mnc-io-docs
am: ad1639e276

* commit 'ad1639e276bdac48946977b89f8959efa14e0c8f':
  docs: Pages for Instant Apps

Change-Id: I1910b63e5891d62244470f540454a3e0a482cdce

8 years agoMerge "docs: Pages for Instant Apps" into mnc-io-docs
Joe Fernandez [Wed, 18 May 2016 07:04:51 +0000 (07:04 +0000)]
Merge "docs: Pages for Instant Apps" into mnc-io-docs

8 years agoDocs: Final changes to DP3 docs. am: 82c668ffc0
David Friedman [Wed, 18 May 2016 07:04:42 +0000 (07:04 +0000)]
Docs: Final changes to DP3 docs. am: 82c668ffc0
am: f28da5297c

* commit 'f28da5297cf4076a378c83215ef93da5ce19b2e2':
  Docs: Final changes to DP3 docs.

Change-Id: Id4c144f150cfed36e0e74797d51b3be70fa423a1

8 years agoDocs: Final changes to DP3 docs.
David Friedman [Wed, 18 May 2016 07:01:40 +0000 (07:01 +0000)]
Docs: Final changes to DP3 docs.
am: 82c668ffc0

* commit '82c668ffc0d72343f51c9203c5085a01ac6f8c09':
  Docs: Final changes to DP3 docs.

Change-Id: Ic273a03cb136829468dafd01129cd4d9a8609446

8 years agoDocs: Final changes to DP3 docs.
David Friedman [Wed, 18 May 2016 06:53:21 +0000 (23:53 -0700)]
Docs: Final changes to DP3 docs.

Change-Id: Ia79f288e6231ef37c25a826653dd9b2cf465542f

8 years agodocs: Pages for Instant Apps
Eric Schmidt [Fri, 13 May 2016 22:21:15 +0000 (15:21 -0700)]
docs: Pages for Instant Apps

Bug: 28317418

Change-Id: I4a6df533435f1637dbfd6225c345985366cce7b3

8 years agoMerge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs am: 19fc346171
Joe Fernandez [Wed, 18 May 2016 06:46:55 +0000 (06:46 +0000)]
Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs am: 19fc346171
am: 14e1f1cd33

* commit '14e1f1cd333f2e38f753bb3461d42479c3849698':
  docs: Wear Preview 2 - fixes and improvements

Change-Id: I7e24a12745c8072467c2e4e4dd7a03fa05f48d61

8 years agoMerge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs
Joe Fernandez [Wed, 18 May 2016 06:42:01 +0000 (06:42 +0000)]
Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs
am: 19fc346171

* commit '19fc34617181419dd6ea70c03692c92fa035bb8f':
  docs: Wear Preview 2 - fixes and improvements

Change-Id: Ia7be06924d42c9fcc27ffd06d0d7c58372bda5bb

8 years agoMerge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs
Joe Fernandez [Wed, 18 May 2016 06:32:56 +0000 (06:32 +0000)]
Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs

8 years agodocs: Wear Preview 2 - fixes and improvements
Joe Fernandez [Wed, 18 May 2016 06:23:47 +0000 (23:23 -0700)]
docs: Wear Preview 2 - fixes and improvements

Change-Id: I0b5ea60157dfa21aa17765571d26c06f5ff866df

8 years agoMerge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs am: 36af257133
David Friedman [Wed, 18 May 2016 06:12:16 +0000 (06:12 +0000)]
Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs am: 36af257133
am: 08016e21d3

* commit '08016e21d3920049a9d10c93293e80aeaf8696fc':
  Docs: Some typo fixes for Wear 2.0 Preview docs.

Change-Id: Ia492ec891ac101039e9915fde55d09be66352b53

8 years agoMerge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs
David Friedman [Wed, 18 May 2016 06:09:44 +0000 (06:09 +0000)]
Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs
am: 36af257133

* commit '36af25713385103a6d1085345232bc82e6dde217':
  Docs: Some typo fixes for Wear 2.0 Preview docs.

Change-Id: Idc67ab630863012d3002f63b21ac4a8fee989d11

8 years agoMerge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs
David Friedman [Wed, 18 May 2016 05:57:39 +0000 (05:57 +0000)]
Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs

8 years agoDocs: Some typo fixes for Wear 2.0 Preview docs.
David Friedman [Wed, 18 May 2016 05:55:04 +0000 (22:55 -0700)]
Docs: Some typo fixes for Wear 2.0 Preview docs.

Change-Id: I87d6d14c95f6350aa36ee71b99cf86b82cc0902a

8 years agoMerge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into...
David Friedman [Wed, 18 May 2016 05:31:05 +0000 (05:31 +0000)]
Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs am: e293ff3bf1
am: fc1bb6e14d

* commit 'fc1bb6e14dac01bd1bc9496cd53169178041d4e0':
  Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.

Change-Id: I2cc0383575a5152159bab7f9b48b39aa147877b2

8 years agoMerge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into...
David Friedman [Wed, 18 May 2016 05:27:56 +0000 (05:27 +0000)]
Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs
am: e293ff3bf1

* commit 'e293ff3bf12f5e215d0d6d5e21fa2315ba4d9fdb':
  Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.

Change-Id: Ib62978421d147abf1afaac1e6640a91324fd328e

8 years agoMerge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into...
David Friedman [Wed, 18 May 2016 05:21:23 +0000 (05:21 +0000)]
Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs

8 years agoMerge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs am: b308d13fe2
Joe Fernandez [Wed, 18 May 2016 05:08:33 +0000 (05:08 +0000)]
Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs am: b308d13fe2
am: 5bc0128ca0

* commit '5bc0128ca0b1f6b8e3bb475013b74ec5d1e460a3':
  docs: Wear Preview 2.0 support page updates

Change-Id: I30e4f95d27cebb281303e720d2f872f36c778a3e

8 years agoMerge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs am...
David Friedman [Wed, 18 May 2016 05:08:28 +0000 (05:08 +0000)]
Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs am: 08c32762bb
am: 4850be7bf9

* commit '4850be7bf9b54bd717789dc26622df8b8679de42':
  Docs: Revisions to Wear 2.0 Preview API Overview page

Change-Id: I77ec3c35534a95b86d193bbed38f3ecb2347ba49

8 years agoDocs: Near-final changes for Android N/Google IO. Continues ag/1037250.
David Friedman [Tue, 17 May 2016 22:31:25 +0000 (15:31 -0700)]
Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.

Change-Id: Ie30cac9f4eb955fc2a06b98348855c71941b9c8d

8 years agoMerge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs
Joe Fernandez [Wed, 18 May 2016 05:03:30 +0000 (05:03 +0000)]
Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs
am: b308d13fe2

* commit 'b308d13fe2d184df101b3418ace57464346c0972':
  docs: Wear Preview 2.0 support page updates

Change-Id: I7055293b960cacd0cf72c968438012e5cd3a9a46

8 years agoMerge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs
David Friedman [Wed, 18 May 2016 05:03:27 +0000 (05:03 +0000)]
Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs
am: 08c32762bb

* commit '08c32762bbbdadd395597c1490cae065c80d5f45':
  Docs: Revisions to Wear 2.0 Preview API Overview page

Change-Id: I447873601ebf36a56866d11657023948e773f943

8 years agoMerge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs
Joe Fernandez [Wed, 18 May 2016 04:57:31 +0000 (04:57 +0000)]
Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs

8 years agoMerge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs
David Friedman [Wed, 18 May 2016 04:54:35 +0000 (04:54 +0000)]
Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs

8 years agodocs: Wear Preview 2.0 support page updates
Joe Fernandez [Wed, 18 May 2016 04:54:36 +0000 (21:54 -0700)]
docs: Wear Preview 2.0 support page updates

Change-Id: I78f461813d154ebbd3b4ea94f80280e265a94983

8 years agoDocs: Revisions to Wear 2.0 Preview API Overview page
David Friedman [Wed, 18 May 2016 02:39:36 +0000 (19:39 -0700)]
Docs: Revisions to Wear 2.0 Preview API Overview page

Bug: 28714669

Change-Id: I2e24fd8ab37cc74e4b8b3828b769b031aa57f863

8 years agodocs: Updating N release notes for DP3 am: 58d5504241
Andrew Solovay [Wed, 18 May 2016 03:03:39 +0000 (03:03 +0000)]
docs: Updating N release notes for DP3 am: 58d5504241
am: dcaaf656e9

* commit 'dcaaf656e9c122b9b33e728034067e631aae6dac':
  docs: Updating N release notes for DP3

Change-Id: I025900aaf8ce18bce53bcf2c57b22dac31a54d51

8 years agodocs: Updating N release notes for DP3
Andrew Solovay [Wed, 18 May 2016 02:59:15 +0000 (02:59 +0000)]
docs: Updating N release notes for DP3
am: 58d5504241

* commit '58d5504241059203727e33847f4d41cc840849bd':
  docs: Updating N release notes for DP3

Change-Id: I1990cae78173970473af2534f4726016044403f2

8 years agodocs: Updating N release notes for DP3
Andrew Solovay [Mon, 16 May 2016 22:11:37 +0000 (15:11 -0700)]
docs: Updating N release notes for DP3

This should be the final version for the released-during-IO-keynote
release notes, though we can certainly do a follow-on update if
more info comes in.

See first comment for doc stage location.

bug: 28591801
Change-Id: I3ab208499e4e567c34ef0bdf27952e874d2da112

8 years agoMerge "Move LocaleList to avoid layering violation." into nyc-dev
Yohei Yukawa [Wed, 18 May 2016 02:14:24 +0000 (02:14 +0000)]
Merge "Move LocaleList to avoid layering violation." into nyc-dev

8 years agodocs: Add redirect for Android Device Monitor and change redirects for Virtual Device...
Cheryl Potter [Wed, 18 May 2016 02:07:33 +0000 (19:07 -0700)]
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config
b/28826469
b/28705592

Change-Id: I67711611ef11dbe215375f7f151f0cfea0bf75b6

8 years agoMerge "Docs: Fixed a wrong adb command example" into mnc-io-docs am: 473ef93497
Hemal Patel [Wed, 18 May 2016 02:06:54 +0000 (02:06 +0000)]
Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs am: 473ef93497
am: 5967692ce1

* commit '5967692ce1f5b36b411dcf90995b16b2b67b01e1':
  Docs: Fixed a wrong adb command example

Change-Id: Ia2bee3ea8f66ef9a86006aed00534944979985b4

8 years agoMerge "Docs: Fixed a wrong adb command example" into mnc-io-docs
Hemal Patel [Wed, 18 May 2016 02:04:19 +0000 (02:04 +0000)]
Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs
am: 473ef93497

* commit '473ef93497256f5c985f88b56c884dc89a72487d':
  Docs: Fixed a wrong adb command example

Change-Id: Id44b8226104fabd0395c21e7d1fd716ade1a88d4

8 years agoMerge "Docs: Fixed a wrong adb command example" into mnc-io-docs
Hemal Patel [Wed, 18 May 2016 01:58:51 +0000 (01:58 +0000)]
Merge "Docs: Fixed a wrong adb command example" into mnc-io-docs

8 years agodocs: Iterating on Wear docs - Complications am: dcab4687db
Bert McMeen [Wed, 18 May 2016 01:53:58 +0000 (01:53 +0000)]
docs: Iterating on Wear docs - Complications am: dcab4687db
am: 0f95b8dc36

* commit '0f95b8dc3604f0ec3cb36de2c6184743099512ba':
  docs: Iterating on Wear docs - Complications

Change-Id: I10ff0c7aeef775fa790c66b3843ab9b8f5b19634

8 years agodocs: Iterating on Wear docs - Complications
Bert McMeen [Wed, 18 May 2016 01:51:16 +0000 (01:51 +0000)]
docs: Iterating on Wear docs - Complications
am: dcab4687db

* commit 'dcab4687db1be19367c8a83853876092f9aad767':
  docs: Iterating on Wear docs - Complications

Change-Id: Ia6503fa4e160eb2657d5feb9564005abd75ff6ac

8 years agodocs: Iterating on Wear docs - Complications
Bert McMeen [Mon, 16 May 2016 01:22:55 +0000 (18:22 -0700)]
docs: Iterating on Wear docs - Complications

Bug: 28425614

Change-Id: I1313f80ae28efdd6d2677399a23acb10e4dbf7da

8 years agoMerge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs am: bd57a67b8f
Andrew Solovay [Wed, 18 May 2016 01:06:41 +0000 (01:06 +0000)]
Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs am: bd57a67b8f
am: 71edb581a2

* commit '71edb581a2b5c04ecabaa004cf61612d384254d4':
  docs: Updating N Preview downloads page for DP3

Change-Id: Icb88562605f909db011819489e40f4763eea76f9

8 years agoMerge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs...
Billy Lamberta [Wed, 18 May 2016 01:06:36 +0000 (01:06 +0000)]
Merge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs am: 2b3870cd94
am: 73836a0e20

* commit '73836a0e20533dcedc1120d54e3134fe713a5a9a':
  docs: work - Update devhub url

Change-Id: Iae6f0f62e756ebb334fcb1833b4eb46f9f607814

8 years agoMerge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs...
Joe Fernandez [Wed, 18 May 2016 01:06:30 +0000 (01:06 +0000)]
Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs am: 2015256ccc
am: a590325a98

* commit 'a590325a98e9ff42f6e825b2615c02bc53be10a8':
  docs: Wear 2 Preview - improve visibility and look of pages

Change-Id: I88902d559f960902a02ae43fc9f921a5f11b0140

8 years agoMerge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs am: 1e2739e635
Sreevani Sreejith [Wed, 18 May 2016 01:06:24 +0000 (01:06 +0000)]
Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs am: 1e2739e635
am: cb62df2b44

* commit 'cb62df2b447ed25b61838eb289691d856d7cb27d':
  Updated documentation for Input Method Framework Wear 2.0

Change-Id: I96c597ad9e68e33927c0d20a1943447b6e264243

8 years agoMerge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview...
Bert McMeen [Wed, 18 May 2016 01:06:17 +0000 (01:06 +0000)]
Merge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview" into mnc-io-docs am: ba803db9a6
am: f097e00a2a

* commit 'f097e00a2a055544f8f4c0bcfede2e5551ba10bb':
  Docs: Iterating on Wear docs - Bridger API

Change-Id: Id0656f935b4bccc49a76df1efea02b9ffa5826d1

8 years agoMerge "Updated app pattern documentation." into mnc-io-docs am: 5d0f016f4b
Bert McMeen [Wed, 18 May 2016 01:06:10 +0000 (01:06 +0000)]
Merge "Updated app pattern documentation." into mnc-io-docs am: 5d0f016f4b
am: 40ee002949

* commit '40ee002949616f2fe36fe543c6a3557984e3f606':
  docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview

Change-Id: I91ec11bdbfa062840643a3bdfa967ec439a52dd5

8 years agoMerge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs am...
Sreevani Sreejith [Wed, 18 May 2016 01:06:02 +0000 (01:06 +0000)]
Merge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs am: abe5e7e366
am: 6bfb873c0f

* commit '6bfb873c0fa59e5533fdd1cb0ad761acbefd2960':
  Updated app pattern documentation.

Change-Id: Idb43de93e35465258a18cab21f5601b996a10a73

8 years agoMerge "API Overview page for Wear 2.0 preview." into mnc-io-docs am: 14981cbe35
Sreevani Sreejith [Wed, 18 May 2016 01:05:53 +0000 (01:05 +0000)]
Merge "API Overview page for Wear 2.0 preview." into mnc-io-docs am: 14981cbe35
am: fd249ffc45

* commit 'fd249ffc458719700da2514a3c059b430eb25243':
  Notification changes for Wear 2.0 and Release notes.

Change-Id: I4adb024effd8fafdc5e32ac040ce40d829b08795

8 years agoMerge "docs: Creating new support library revision history page" into mnc-mr-docs...
Sreevani Sreejith [Wed, 18 May 2016 01:05:43 +0000 (01:05 +0000)]
Merge "docs: Creating new support library revision history page" into mnc-mr-docs am: e780c62462 am: f62ae36a96
am: c48a127662

* commit 'c48a127662e73276210277195a11d38c296eb36b':
  API Overview page for Wear 2.0 preview.

Change-Id: I8b267adb22b24ac0c098b8945e7dfc3e6c17abdf

8 years agoPIP: Fix NPE when enters Recents with PIP
Jaewan Kim [Wed, 18 May 2016 01:02:45 +0000 (10:02 +0900)]
PIP: Fix NPE when enters Recents with PIP

Bug: 28826021
Change-Id: Ic81f705dccbd4b334ed5a26345fdc5fee23f5a68

8 years agoMerge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev
Andrew Solovay [Wed, 18 May 2016 01:00:12 +0000 (01:00 +0000)]
Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev

8 years agoMerge "Document that SurfaceView is synchronous in N" into nyc-dev
TreeHugger Robot [Wed, 18 May 2016 00:51:56 +0000 (00:51 +0000)]
Merge "Document that SurfaceView is synchronous in N" into nyc-dev

8 years agoDocs: Fixed a wrong adb command example
Hemal Patel [Wed, 18 May 2016 00:00:32 +0000 (17:00 -0700)]
Docs: Fixed a wrong adb command example

Bug: 28310568

Change-Id: Ie727a7dcbcba23a6fed36ff6b1572096d3cc7832

8 years agoMerge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
Andrii Kulian [Wed, 18 May 2016 00:51:15 +0000 (00:51 +0000)]
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev

8 years agoMerge changes If51568c3,Idd434c19 into nyc-dev
TreeHugger Robot [Wed, 18 May 2016 00:46:45 +0000 (00:46 +0000)]
Merge changes If51568c3,Idd434c19 into nyc-dev

* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

8 years agoMerge "Hide HdrCapabilities constructor." into nyc-dev
Hangyu Kuang [Wed, 18 May 2016 00:42:54 +0000 (00:42 +0000)]
Merge "Hide HdrCapabilities constructor." into nyc-dev

8 years agoMerge "Fix threading problems with drawables" into nyc-dev
TreeHugger Robot [Wed, 18 May 2016 00:24:03 +0000 (00:24 +0000)]
Merge "Fix threading problems with drawables" into nyc-dev

8 years agoMerge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs
Andrew Solovay [Wed, 18 May 2016 00:23:37 +0000 (00:23 +0000)]
Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs
am: bd57a67b8f

* commit 'bd57a67b8f806eea57063f7d5d5188d8b318d3a2':
  docs: Updating N Preview downloads page for DP3

Change-Id: Id6aa668761f1c854556d12dc09c22723f81b28f3

8 years agoMerge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs
Andrew Solovay [Wed, 18 May 2016 00:18:07 +0000 (00:18 +0000)]
Merge "docs: Updating N Preview downloads page for DP3" into mnc-io-docs

8 years agoresolve merge conflicts of bd96855 to nyc-dev
Andrew Solovay [Wed, 18 May 2016 00:06:52 +0000 (17:06 -0700)]
resolve merge conflicts of bd96855 to nyc-dev

Change-Id: Ic07598d00f7ea59f800c260ba448a16df4e397dd

8 years agoMerge "Adjust Notification APIs per API council" into nyc-dev
TreeHugger Robot [Wed, 18 May 2016 00:06:29 +0000 (00:06 +0000)]
Merge "Adjust Notification APIs per API council" into nyc-dev

8 years agodocs: Updating N Preview downloads page for DP3
Andrew Solovay [Tue, 17 May 2016 21:19:05 +0000 (14:19 -0700)]
docs: Updating N Preview downloads page for DP3

Updated downloads and OTA-downloads pages with DP3 binaries.
Tested all downloads and verified the checksums before uploading
the patchset.

See first comment for doc stage location.

bug: 28817699
Change-Id: I03f2560ca0516343d764a3596a0d133ab73f636c

8 years agoMerge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs
Joe Fernandez [Tue, 17 May 2016 23:57:09 +0000 (23:57 +0000)]
Merge "docs: Wear 2 Preview - improve visibility and look of pages" into mnc-io-docs
am: 2b3870cd94

* commit '2b3870cd949d7dbd8d5b6a75b08794c654df00c6':
  docs: work - Update devhub url

Change-Id: I331f94361c3ab22ac277a5dd93b551a6cc617c36

8 years agoMerge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs
sreevanis [Tue, 17 May 2016 23:57:07 +0000 (23:57 +0000)]
Merge "Updated documentation for Input Method Framework Wear 2.0" into mnc-io-docs
am: 2015256ccc

* commit '2015256ccc5b26593441254cdfc695055f840420':
  docs: Wear 2 Preview - improve visibility and look of pages

Change-Id: I2b5e1be660bb53989ce9dc47e0ba576a2d66d471

8 years agoMerge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs
Bert McMeen [Tue, 17 May 2016 23:57:04 +0000 (23:57 +0000)]
Merge "Docs: Iterating on Wear docs - Bridger API" into mnc-io-docs
am: 1e2739e635

* commit '1e2739e635f89aac86354f6e5b885138634ffe54':
  Updated documentation for Input Method Framework Wear 2.0

Change-Id: I35029d1eadc0e849382928645faba29f11c3eb5a

8 years agoMerge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview...
Bert McMeen [Tue, 17 May 2016 23:57:00 +0000 (23:57 +0000)]
Merge "docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview" into mnc-io-docs
am: ba803db9a6

* commit 'ba803db9a62a58b1d98a0f889aa094e86fbbf6cd':
  Docs: Iterating on Wear docs - Bridger API

Change-Id: I7b1e36ebe1bcadb4af2dc70c50333cd4d839b55d

8 years agoMerge "Updated app pattern documentation." into mnc-io-docs
sreevanis [Tue, 17 May 2016 23:56:57 +0000 (23:56 +0000)]
Merge "Updated app pattern documentation." into mnc-io-docs
am: 5d0f016f4b

* commit '5d0f016f4b6e18214892ee87f4942509764652c8':
  docs: Iterating on Wear docs - Get Started, Download/Test, Program Overview

Change-Id: I5eea8daa157ba5dd94e60bb9bd49593587fe8a0c

8 years agoMerge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs
sreevanis [Tue, 17 May 2016 23:56:52 +0000 (23:56 +0000)]
Merge "Notification changes for Wear 2.0 and Release notes." into mnc-io-docs
am: abe5e7e366

* commit 'abe5e7e366873bda0e0119c798e97064fd1b8abc':
  Updated app pattern documentation.

Change-Id: Ib1405a77bfd5f3a068fc2916232c92667a6ab635

8 years agoMerge "API Overview page for Wear 2.0 preview." into mnc-io-docs
sreevanis [Tue, 17 May 2016 23:56:45 +0000 (23:56 +0000)]
Merge "API Overview page for Wear 2.0 preview." into mnc-io-docs
am: 14981cbe35

* commit '14981cbe35371a8096de6f3c399e29c7167e3ddc':
  Notification changes for Wear 2.0 and Release notes.

Change-Id: Ie9b0e6f86e3d32dbb426ee8bfc1731eaac07de15

8 years agoMerge "docs: Creating new support library revision history page" into mnc-mr-docs...
Andrew Solovay [Tue, 17 May 2016 23:56:39 +0000 (23:56 +0000)]
Merge "docs: Creating new support library revision history page" into mnc-mr-docs am: e780c62462
am: f62ae36a96

* commit 'f62ae36a96351d44cacdbbdbb5e3dc46413b7e49':
  API Overview page for Wear 2.0 preview.

Change-Id: I5d6b935700e5fa977f3245044c74755e8cf9246a

8 years agoMerge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into...
Dianne Hackborn [Tue, 17 May 2016 23:54:13 +0000 (23:54 +0000)]
Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev