OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:09:31 +0000 (23:09 +0000)]
Merge "Fix NPE in FlashlightController" into lmp-dev

9 years agoam 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:22:10 +0000 (22:22 +0000)]
am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page

9 years agoMerge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:16:11 +0000 (22:16 +0000)]
Merge "add Places API to the Location feature page" into lmp-docs

9 years agoam dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp...
Joe Fernandez [Thu, 19 Mar 2015 20:21:47 +0000 (20:21 +0000)]
am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 20:21:43 +0000 (20:21 +0000)]
am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play service...
Joe Fernandez [Thu, 19 Mar 2015 20:21:37 +0000 (20:21 +0000)]
am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoMerge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 20:16:31 +0000 (20:16 +0000)]
Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect...
Joe Fernandez [Thu, 19 Mar 2015 20:16:20 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla...
Joe Fernandez [Thu, 19 Mar 2015 20:16:03 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

9 years agoam e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:10:55 +0000 (20:10 +0000)]
am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit 'e43a64e3336548094571885944afc28792e24fa0':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:05:49 +0000 (20:05 +0000)]
Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

9 years agoam d5885842: Merge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:10:06 +0000 (19:10 +0000)]
am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'd58858427e102bec7ebe1d2a8ce418529924a68c':
  docs: proguard help update

9 years agoMerge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:04:04 +0000 (19:04 +0000)]
Merge "docs: proguard help update" into lmp-docs

9 years agodocs: proguard help update
Rich Slogar [Tue, 3 Mar 2015 20:27:16 +0000 (12:27 -0800)]
docs: proguard help update

b/19383794
b/19417644

Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764

9 years agoRESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 16:39:43 +0000 (16:39 +0000)]
RESUBMIT: "Doc change: add docs for SafetyNet API.""

This reverts commit 1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0.

Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0

9 years agoRESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes...
Joe Fernandez [Thu, 19 Mar 2015 16:38:05 +0000 (16:38 +0000)]
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

This reverts commit 2a867108951807e467dbfe0fcd4cc48a4d7f4191.

Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4

9 years agoRESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Gener...
Joe Fernandez [Thu, 19 Mar 2015 16:36:02 +0000 (16:36 +0000)]
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

This reverts commit c0e9ac455568b2d82d191388708a281bdb376cc9.

Change-Id: Iccc75ead90c92602b25da70e13bcdd55a6d129b6

9 years agoam b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:23:30 +0000 (05:23 +0000)]
am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'b67971b512d95d5d9befb9d95417f9c3d8cb3a44':
  docs: updated Auto training landing page

9 years agoMerge "docs: updated Auto training landing page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:19:21 +0000 (05:19 +0000)]
Merge "docs: updated Auto training landing page" into lmp-docs

9 years agodocs: updated Auto training landing page
Joe Fernandez [Sat, 7 Mar 2015 00:08:13 +0000 (16:08 -0800)]
docs: updated Auto training landing page

Change-Id: I407681892071b82523c5533539c777f77a8dd429

9 years agoam 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:05:08 +0000 (05:05 +0000)]
am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '4189bd99572a8dfa4a84e05a03a6d87d794d2e36':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 05:05:04 +0000 (05:05 +0000)]
am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '5a5e6a37011795135b7ebbaf4ae5645d72f8f147':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 05:04:58 +0000 (05:04 +0000)]
am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit 'ceb10eac8ec07be00a3eca68ea1be68cb5ebc78c':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoMerge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:00:45 +0000 (05:00 +0000)]
Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

9 years agoMerge "Revert "docs: Updated 'What's New' in Google Play services doc to reflect...
Joe Fernandez [Thu, 19 Mar 2015 05:00:03 +0000 (05:00 +0000)]
Merge "Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

9 years agoMerge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla...
Joe Fernandez [Thu, 19 Mar 2015 04:58:17 +0000 (04:58 +0000)]
Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

9 years agoRevert "Doc change: add docs for SafetyNet API."
Joe Fernandez [Thu, 19 Mar 2015 04:55:05 +0000 (04:55 +0000)]
Revert "Doc change: add docs for SafetyNet API."

Reason: Android Auto needs to release ahead of Orla which is delayed.
This change is in the way, right now, but will be re-submitted.

This reverts commit 11e80575660e81d7e053d7fce604bf421ca2f3ce.

Change-Id: I6661e1e780ce8aee9bdaed82fcff4f96fc3349e7

9 years agoRevert "docs: Updated 'What's New' in Google Play services doc to reflect changes...
Joe Fernandez [Thu, 19 Mar 2015 04:51:17 +0000 (04:51 +0000)]
Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

This reverts commit b2a6185e259c2e9bbb48d729563263cf7234a837.

Change-Id: I64f49cba3a87fe0f6a9db12a68d8a0064810a1d8

9 years agoRevert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generate...
Joe Fernandez [Thu, 19 Mar 2015 04:49:40 +0000 (04:49 +0000)]
Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

This reverts commit 180b835480b113e497268243a12cb2c244d9559e.

Change-Id: Ibcefe65a1a7829b8b424763aba636300665a7f7b

9 years agoChanges for a quick, pre-migration bug sprint:
Eric Gilmore [Tue, 17 Mar 2015 22:46:15 +0000 (15:46 -0700)]
Changes for a quick, pre-migration bug sprint:

Bug: 196790701971668419680472.
Change-Id: I14ba1cf53ea42cd7739793fd9873e40e4a2ee6a0

9 years agoam 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design...
Joe Fernandez [Wed, 18 Mar 2015 23:47:26 +0000 (23:47 +0000)]
am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

* commit '59d6c8bdaf6428f10d0c8bf144de7c39848ed868':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

9 years agoam cb92819f: Merge "docs: Add distribution guidelines and update quality checklist...
Joe Fernandez [Wed, 18 Mar 2015 23:47:22 +0000 (23:47 +0000)]
am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

* commit 'cb92819facfa4170623ba97130044a5700b4968b':
  docs: Add distribution guidelines and update quality checklist for Android Auto.

9 years agoMerge "cherrypick from lmp-docs docs: Update auto landing and design page image asset...
Joe Fernandez [Wed, 18 Mar 2015 23:41:54 +0000 (23:41 +0000)]
Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs

9 years agoMerge "docs: Add distribution guidelines and update quality checklist for Android...
Joe Fernandez [Wed, 18 Mar 2015 23:41:28 +0000 (23:41 +0000)]
Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs

9 years agoam 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs
Joe Fernandez [Wed, 18 Mar 2015 23:37:14 +0000 (23:37 +0000)]
am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs

* commit '3bbb646b8a231731327d10a3a243e2f252e185f1':
  Doc change: add docs for SafetyNet API.

9 years agoam 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to...
Quddus Chong [Wed, 18 Mar 2015 23:37:09 +0000 (23:37 +0000)]
am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs

* commit '9b278f5615966f1d642f2503759f6618292058bb':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.

9 years agoam abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0...
Quddus Chong [Wed, 18 Mar 2015 23:37:03 +0000 (23:37 +0000)]
am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs

* commit 'abde3d83f86af44e2beedc2fc10bfc23a405a5d9':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

9 years agoMerge "Doc change: add docs for SafetyNet API." into lmp-docs
Joe Fernandez [Wed, 18 Mar 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Doc change: add docs for SafetyNet API." into lmp-docs

9 years agoMerge "docs: Updated 'What's New' in Google Play services doc to reflect changes...
Quddus Chong [Wed, 18 Mar 2015 23:29:55 +0000 (23:29 +0000)]
Merge "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs

9 years agoMerge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated...
Quddus Chong [Wed, 18 Mar 2015 23:29:42 +0000 (23:29 +0000)]
Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs

9 years agoDoc change: add docs for SafetyNet API.
Dirk Dougherty [Tue, 24 Feb 2015 00:56:04 +0000 (16:56 -0800)]
Doc change: add docs for SafetyNet API.

Change-Id: I265320788718672ac117c9ff6033e48d1e9161a5

9 years agodocs: Updated 'What's New' in Google Play services doc to reflect changes in GMS...
Quddus Chong [Wed, 4 Mar 2015 22:46:18 +0000 (14:46 -0800)]
docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.

Change-Id: I4154c04a3a64fce1ec314a40237ab4c5472d651c

9 years agoam 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:35:59 +0000 (22:35 +0000)]
am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs

* commit '78bbfe049c5e7a0c2f7ac8fe39f45b11d9099a55':
  docs: Removed sentence fragments.

9 years agoam ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:35:49 +0000 (22:35 +0000)]
am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

* commit 'ae279bd5b03f472d4bd1427365009269db9fe5e3':
  docs: Fixed typo (spurious quotation mark).

9 years agoam 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code sampl...
Andrew Solovay [Wed, 18 Mar 2015 22:35:45 +0000 (22:35 +0000)]
am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

* commit '0aef0abf3d3366c09a89d3132ff2ce5979988fc1':
  docs: Fixed broken image link, and broke long lines in code samples

9 years agoMerge "docs: Removed sentence fragments." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:27:07 +0000 (22:27 +0000)]
Merge "docs: Removed sentence fragments." into lmp-docs

9 years agoMerge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:26:04 +0000 (22:26 +0000)]
Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

9 years agoMerge "docs: Fixed broken image link, and broke long lines in code samples" into...
Andrew Solovay [Wed, 18 Mar 2015 22:23:10 +0000 (22:23 +0000)]
Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

9 years agodocs: Removed sentence fragments.
Andrew Solovay [Wed, 18 Mar 2015 18:56:20 +0000 (11:56 -0700)]
docs: Removed sentence fragments.

These fragments were left over from the edit process for the original
CL (http://ag/586972). The paragraph they belong to was removed.

See first comment for doc stage location.

bug: 19793140
Change-Id: Iafa30c4036c57ba00b534d619cd1fa4135f60175

9 years agoam ddc44153: docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:13:55 +0000 (17:13 +0000)]
am ddc44153: docs: downloads for sdk 24.1.2

* commit 'ddc44153295174e8195286c21d7edcd3962b3661':
  docs: downloads for sdk 24.1.2

9 years agodocs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 00:19:07 +0000 (17:19 -0700)]
docs: downloads for sdk 24.1.2

b.android 160727

Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd

9 years agodocs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from...
Quddus Chong [Mon, 2 Mar 2015 21:46:56 +0000 (13:46 -0800)]
docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.

Change-Id: Iea6a787896d22ec29702fc7370d9ad702af051b7

9 years agodocs: Add distribution guidelines and update quality checklist
Luan Nguyen [Fri, 6 Mar 2015 00:02:08 +0000 (16:02 -0800)]
docs: Add distribution guidelines and update quality checklist
for Android Auto.

Change-Id: Ie504fee6ee32fd24d332ff65004a6b711e7fe3ec

9 years agoFix AppCompat action bar theming.
Deepanshu Gupta [Fri, 13 Mar 2015 18:06:47 +0000 (11:06 -0700)]
Fix AppCompat action bar theming.

Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967

9 years agoFix NoActionBar themes rendering.
Deepanshu Gupta [Fri, 13 Mar 2015 01:46:36 +0000 (18:46 -0700)]
Fix NoActionBar themes rendering.

Also fix some warnings.

Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e

9 years agodocs: Fixed typo (spurious quotation mark).
Andrew Solovay [Fri, 13 Mar 2015 20:52:04 +0000 (13:52 -0700)]
docs: Fixed typo (spurious quotation mark).

See first comment for stage location.

bug: 18612085
Change-Id: I4c29a087621d1c62596838d30b2654ee136cecd1

9 years agodocs: Fixed broken image link, and broke long lines in code samples
Andrew Solovay [Fri, 13 Mar 2015 18:45:24 +0000 (11:45 -0700)]
docs: Fixed broken image link, and broke long lines in code samples

While I had gridview open (per the bug), I also checked the other
files in that directory for broken image links (in case this stemmed
from a doc reorg). I didn't find any broken images, but I did find
a couple of code samples that unnecessarily had horizontal scroll
bars, so I fixed those.

See first comment for doc stage location.

bug: 19611361
Change-Id: I983a09aaee5e2b1747376748c1aa46341c31a3c2

9 years agoam 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides...
Luan Nguyen [Fri, 13 Mar 2015 17:49:46 +0000 (17:49 +0000)]
am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs

* commit '42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit

9 years agoMerge "docs: Remove deprecated Fitness information from this doc. Guides have been...
Luan Nguyen [Fri, 13 Mar 2015 17:42:04 +0000 (17:42 +0000)]
Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs

9 years agocherrypick from lmp-docs docs: Update auto landing and design page image
Luan Nguyen [Thu, 5 Mar 2015 18:38:32 +0000 (10:38 -0800)]
cherrypick from lmp-docs docs: Update auto landing and design page image
assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

Change-Id: I05d519595997683e88aaaa84ec76b353c3985aa7

9 years agoam 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
Craig Mautner [Fri, 13 Mar 2015 00:17:36 +0000 (00:17 +0000)]
am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
  Correct docs to specify leading slash in paths.

9 years agoMerge "Correct docs to specify leading slash in paths." into lmp-docs
Craig Mautner [Fri, 13 Mar 2015 00:09:30 +0000 (00:09 +0000)]
Merge "Correct docs to specify leading slash in paths." into lmp-docs

9 years agoam a6b0ddb7: Merge "docs: build image updates" into lmp-docs
Rich Slogar [Thu, 12 Mar 2015 00:38:38 +0000 (00:38 +0000)]
am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit 'a6b0ddb7f1437d67538364f16dedb61f7966c653':
  docs: build image updates

9 years agoMerge "docs: build image updates" into lmp-docs
Rich Slogar [Thu, 12 Mar 2015 00:34:09 +0000 (00:34 +0000)]
Merge "docs: build image updates" into lmp-docs

9 years agoMerge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:45 +0000 (00:32 +0000)]
Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

9 years agoFix cyclic dependency in BlendComposite and BlendingMode.
Deepanshu Gupta [Wed, 11 Mar 2015 23:34:13 +0000 (16:34 -0700)]
Fix cyclic dependency in BlendComposite and BlendingMode.

Introduced in commit 1a10ca7e526736b4fd143f7c9f3b29643c0062a4

Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a

9 years agoam 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing...
Quddus Chong [Wed, 11 Mar 2015 23:16:59 +0000 (23:16 +0000)]
am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs

* commit '47426f1c190b17548eabb50fad3945844f1a7363':
  docs: Added overview page and Javadocs for the Android Testing Support Library.

9 years agoMerge "docs: Added overview page and Javadocs for the Android Testing Support Library...
Quddus Chong [Wed, 11 Mar 2015 23:11:02 +0000 (23:11 +0000)]
Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs

9 years agodocs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Fri, 27 Feb 2015 00:38:46 +0000 (16:38 -0800)]
docs: Added overview page and Javadocs for the Android Testing Support Library.

Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed

9 years agoam 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets...
Luan Nguyen [Wed, 11 Mar 2015 16:35:32 +0000 (16:35 +0000)]
am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs

* commit '9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
  Revert "docs: Update auto landing and design page image assets"

9 years agoMerge "Revert "docs: Update auto landing and design page image assets"" into lmp...
Luan Nguyen [Wed, 11 Mar 2015 16:25:32 +0000 (16:25 +0000)]
Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs

9 years agoRevert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 16:20:52 +0000 (16:20 +0000)]
Revert "docs: Update auto landing and design page image assets"

This reverts commit 7859590acd229b66c1953d3d4ed9538261d6b898.

Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19

9 years agoCorrect docs to specify leading slash in paths.
Craig Mautner [Thu, 5 Mar 2015 17:11:55 +0000 (09:11 -0800)]
Correct docs to specify leading slash in paths.

The guide documentation for the manifest data element contains a
grammar that implies leading slashes are not required for the path
part of a URI string. Also the path documentation does not mention
the need for a leading slash.

Grammar from documentation:
<scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>]
                        ^
                        |
Included "/" -----------+

All internal usages of path, pathPrefix, and pathPattern, have a /
starting out the string and these attributes don't work without that
/.

This change updates the grammar and the documentation for the path
attributes.

Fixes bug 19540035

Change-Id: I931a25fd1c10c01eaa32a7cfa82cca256b129efb

9 years agoam 0fc17c37: Merge "docs: Update auto landing and design page image assets" into...
Luan Nguyen [Tue, 10 Mar 2015 19:22:37 +0000 (19:22 +0000)]
am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs

* commit '0fc17c37a514a80073631dffa381ec07caed93cf':
  docs: Update auto landing and design page image assets

9 years agoam 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
Rich Slogar [Tue, 10 Mar 2015 19:22:33 +0000 (19:22 +0000)]
am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
  docs: eclipse revisions update

9 years agoMerge "docs: Update auto landing and design page image assets" into lmp-docs
Luan Nguyen [Tue, 10 Mar 2015 19:18:53 +0000 (19:18 +0000)]
Merge "docs: Update auto landing and design page image assets" into lmp-docs

9 years agoMerge "docs: eclipse revisions update" into lmp-docs
Rich Slogar [Tue, 10 Mar 2015 19:15:00 +0000 (19:15 +0000)]
Merge "docs: eclipse revisions update" into lmp-docs

9 years agodocs: eclipse revisions update
Rich Slogar [Thu, 5 Mar 2015 00:56:22 +0000 (16:56 -0800)]
docs: eclipse revisions update

Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3

9 years agoam 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
Andrew Solovay [Tue, 10 Mar 2015 01:29:29 +0000 (01:29 +0000)]
am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit '0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00':
  docs: Revisions to "Providing Messaging for Auto"

9 years agodocs: Update auto landing and design page image assets
Luan Nguyen [Thu, 5 Mar 2015 18:38:32 +0000 (10:38 -0800)]
docs: Update auto landing and design page image assets

Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819

9 years agodocs: Revisions to "Providing Messaging for Auto"
Andrew Solovay [Wed, 26 Nov 2014 00:20:51 +0000 (16:20 -0800)]
docs: Revisions to "Providing Messaging for Auto"

Added a workflow section and "important classes", and tightened up the
rest of the doc to (hopefully) make it all clearer. See first comment
for doc stage location.

Change-Id: Ifa8db66768a096ae1059ddf17760fee8d74c7c6e

9 years agoam 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes"...
Rich Slogar [Mon, 9 Mar 2015 19:34:32 +0000 (19:34 +0000)]
am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs

* commit '6e1cbe43957b18f471f82682b5df999578230230':
  docs: android plugin for gradle release 1.1.3 release notes

9 years agoMerge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
Rich Slogar [Mon, 9 Mar 2015 19:29:36 +0000 (19:29 +0000)]
Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs

9 years agoam 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
Luan Nguyen [Mon, 9 Mar 2015 14:52:45 +0000 (14:52 +0000)]
am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs

* commit '6a96a77814a89836ba0a85335479c6b3ea9aec33':
  docs: Add new partners to Wear index page

9 years agoMerge "docs: Add new partners to Wear index page" into lmp-docs
Luan Nguyen [Mon, 9 Mar 2015 14:47:31 +0000 (14:47 +0000)]
Merge "docs: Add new partners to Wear index page" into lmp-docs

9 years agodocs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Sat, 7 Mar 2015 00:12:26 +0000 (16:12 -0800)]
docs: android plugin for gradle release 1.1.3 release notes

Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1

9 years agoadd Places API to the Location feature page
smain@google.com [Thu, 5 Mar 2015 03:36:31 +0000 (19:36 -0800)]
add Places API to the Location feature page

Change-Id: I087be42be2e117817a3f589d03bd532fb590a62a

9 years agoam 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp...
Eric Gilmore [Fri, 6 Mar 2015 19:20:45 +0000 (19:20 +0000)]
am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs

* commit '0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
  Reworking geofencing training to new API and sample.

9 years agoMerge "Reworking geofencing training to new API and sample." into lmp-docs
Eric Gilmore [Fri, 6 Mar 2015 19:14:27 +0000 (19:14 +0000)]
Merge "Reworking geofencing training to new API and sample." into lmp-docs

9 years agoReworking geofencing training to new API and sample.
Eric Gilmore [Fri, 30 Jan 2015 00:21:43 +0000 (16:21 -0800)]
Reworking geofencing training to new API and sample.

Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3

9 years agoam 5afdc97f: Fix USB typos
Glenn Kasten [Fri, 6 Mar 2015 16:25:58 +0000 (16:25 +0000)]
am 5afdc97f: Fix USB typos

* commit '5afdc97f2e41845e7ddf512814771d4cdf134171':
  Fix USB typos

9 years agoFix USB typos
Glenn Kasten [Thu, 31 Jul 2014 18:11:11 +0000 (11:11 -0700)]
Fix USB typos

Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit 9e86f6139b62dbc87b7ea97cedf847c847657829)

9 years agoam 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp...
Eric Gilmore [Thu, 5 Mar 2015 22:34:58 +0000 (22:34 +0000)]
am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs

* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
  Re-fixing link, and removing trailing white space.

9 years agoMerge "Re-fixing link, and removing trailing white space." into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Re-fixing link, and removing trailing white space." into lmp-docs

9 years agoRe-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.

Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93

9 years agoam 4aba69a8: docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am 4aba69a8: docs: sdk tools date fix

* commit '4aba69a8a7f58541ce76429252dd0c9650b40f35':
  docs: sdk tools date fix

9 years agodocs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix

Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14

9 years agoam f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
  add tags for wakelock and other API names

9 years agoMerge "add tags for wakelock and other API names" into lmp-docs
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs

9 years agoam 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

* commit '22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
  Fixing broken link per b/19503824.