OSDN Git Service

android-x86/frameworks-base.git
9 years agoam ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 00:18:51 +0000 (00:18 +0000)]
am ea2a0648: Explain behavior of boundless ripple projection

* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection

9 years agoExplain behavior of boundless ripple projection
Chris Craik [Tue, 24 Feb 2015 21:58:26 +0000 (13:58 -0800)]
Explain behavior of boundless ripple projection

Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab

9 years agoMerge "Set forceFramework correctly for included layouts." into lmp-dev
Deepanshu Gupta [Mon, 23 Feb 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Set forceFramework correctly for included layouts." into lmp-dev

9 years agoam 88e0145f: Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:06:47 +0000 (18:06 +0000)]
am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.

9 years agoam 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:06:43 +0000 (18:06 +0000)]
am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984

9 years agoMerge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:05:35 +0000 (18:05 +0000)]
Merge "Fixes several typos." into lmp-docs

9 years agoMerge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:02:25 +0000 (18:02 +0000)]
Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

9 years agoSet forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 17:18:08 +0000 (09:18 -0800)]
Set forceFramework correctly for included layouts.

Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4

9 years agoam 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
Rich Slogar [Sat, 21 Feb 2015 00:51:05 +0000 (00:51 +0000)]
am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '4a99918b40329e7d041db0de1e1863d688eb1b3b':
  docs: android plugin revisions page v2

9 years agoMerge "docs: android plugin revisions page v2" into lmp-docs
Rich Slogar [Sat, 21 Feb 2015 00:44:49 +0000 (00:44 +0000)]
Merge "docs: android plugin revisions page v2" into lmp-docs

9 years agoUpdate Google Play brand-info page.
David Friedman [Fri, 13 Feb 2015 03:43:35 +0000 (19:43 -0800)]
Update Google Play brand-info page.
Bug: 18257984

Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c

9 years agoam 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into...
Luan Nguyen [Fri, 20 Feb 2015 23:40:47 +0000 (23:40 +0000)]
am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '81752cf5148b93ef84f8890cb04876344924eae8':
  docs: Fix issue with older devices section not expanding

9 years agoMerge "docs: Fix issue with older devices section not expanding" into lmp-docs
Luan Nguyen [Fri, 20 Feb 2015 23:36:16 +0000 (23:36 +0000)]
Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

9 years agodocs: android plugin revisions page v2
Rich Slogar [Wed, 18 Feb 2015 21:09:43 +0000 (13:09 -0800)]
docs: android plugin revisions page v2

Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2

9 years agoFixes several typos.
David Friedman [Fri, 20 Feb 2015 17:40:06 +0000 (09:40 -0800)]
Fixes several typos.

Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca

9 years agoam 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 21:51:30 +0000 (21:51 +0000)]
am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit '506cba8b51474e5dc5cdcf381d0a25dc118c2aca':
  Doc Update: fixed unescaped angle brackets in code snippets.

9 years agoDoc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 20:17:18 +0000 (12:17 -0800)]
Doc Update: fixed unescaped angle brackets in code snippets.

Change-Id: Ie265dd58fb3a5fcffe955992dea7a1f9417a27d7

9 years agoam b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
Rich Slogar [Thu, 19 Feb 2015 18:59:21 +0000 (18:59 +0000)]
am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs

* commit 'b87aa6cb96341ab32d21f5340f1064fcaa607920':
  docs: mipmap link updates

9 years agoMerge "docs: mipmap link updates" into lmp-docs
Rich Slogar [Thu, 19 Feb 2015 18:55:25 +0000 (18:55 +0000)]
Merge "docs: mipmap link updates" into lmp-docs

9 years agodocs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 18:48:37 +0000 (10:48 -0800)]
docs: mipmap link updates

Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa

9 years agoam f4f059d4: docs: studio 1.1 downloads
Rich Slogar [Thu, 19 Feb 2015 16:52:35 +0000 (16:52 +0000)]
am f4f059d4: docs: studio 1.1 downloads

* commit 'f4f059d423add55516a8ea4bb1522f1329039e47':
  docs: studio 1.1 downloads

9 years agodocs: studio 1.1 downloads
Rich Slogar [Tue, 17 Feb 2015 20:14:16 +0000 (12:14 -0800)]
docs: studio 1.1 downloads

Change-Id: I663a91baba3b0a1e51aa8e3dbc991f067d0c255c

9 years agoam e385672c: docs: remove reference to GCM doc from C2DM doc
Joe Fernandez [Thu, 19 Feb 2015 00:30:32 +0000 (00:30 +0000)]
am e385672c: docs: remove reference to GCM doc from C2DM doc

* commit 'e385672c9cb7ad212a92b77f72974035812ae9f1':
  docs: remove reference to GCM doc from C2DM doc

9 years agodocs: remove reference to GCM doc from C2DM doc
Joe Fernandez [Thu, 19 Feb 2015 00:16:43 +0000 (16:16 -0800)]
docs: remove reference to GCM doc from C2DM doc

Change-Id: Ic044916487d56bab22e30b24392890b97acf9d44

9 years agoMerge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
Natalie Silvanovich [Thu, 19 Feb 2015 00:02:30 +0000 (00:02 +0000)]
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

9 years agoam 56375d90: docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:07:50 +0000 (23:07 +0000)]
am 56375d90: docs: lint inspection updates

* commit '56375d90662041c3f3e98c6b77f5a3c3c506f43b':
  docs: lint inspection updates

9 years agodocs: lint inspection updates
Rich Slogar [Wed, 7 Jan 2015 21:52:12 +0000 (13:52 -0800)]
docs: lint inspection updates

Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f

9 years agoam 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
Rich Slogar [Wed, 18 Feb 2015 00:00:39 +0000 (00:00 +0000)]
am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs

* commit '717b4d130f67606c44122c2219ed35996afc360c':
  docs: note to install linux packages

9 years agoMerge "docs: note to install linux packages" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 23:54:49 +0000 (23:54 +0000)]
Merge "docs: note to install linux packages" into lmp-docs

9 years agoam 9911aa51: Merge "docs: studio training basics create and run project updates"...
Rich Slogar [Tue, 17 Feb 2015 23:47:29 +0000 (23:47 +0000)]
am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs

* commit '9911aa51255d26c4299ab612430cd400e9468bcc':
  docs: studio training basics create and run project updates

9 years agoMerge "docs: studio training basics create and run project updates" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 23:40:35 +0000 (23:40 +0000)]
Merge "docs: studio training basics create and run project updates" into lmp-docs

9 years agoam fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated...
Andrew Solovay [Tue, 17 Feb 2015 22:49:16 +0000 (22:49 +0000)]
am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs

* commit 'fd454a579f5a474546db616aa014505cd50865b5':
  docs: Noted that purchaseToken is long and cannot be truncated.

9 years agoMerge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp...
Andrew Solovay [Tue, 17 Feb 2015 22:41:03 +0000 (22:41 +0000)]
Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs

9 years agoam 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
Rich Sloager [Tue, 17 Feb 2015 22:20:43 +0000 (22:20 +0000)]
am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs

* commit '099ce51393721424a7cc1fbd29fe59a1970a55ed':
  Revert "docs: studio proxy setup"

9 years agoam 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:13:51 +0000 (22:13 +0000)]
am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs

* commit '40132ee15afbc45858b637410aecb861da60878a':
  docs: site mipmap folder updates

9 years agoam 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:13:48 +0000 (22:13 +0000)]
am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs

* commit '3c3b780caea0bec62904a83f385f5a865fb259a7':
  docs: studio mipmap update

9 years agoMerge "Revert "docs: studio proxy setup"" into lmp-docs
Rich Sloager [Tue, 17 Feb 2015 22:13:44 +0000 (22:13 +0000)]
Merge "Revert "docs: studio proxy setup"" into lmp-docs

9 years agoRevert "docs: studio proxy setup"
Rich Sloager [Tue, 17 Feb 2015 22:10:27 +0000 (22:10 +0000)]
Revert "docs: studio proxy setup"

This reverts commit c3e0107ce30aa676011bf7ea0daa9c8db750f024.

Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b

9 years agoMerge "docs: site mipmap folder updates" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:08:41 +0000 (22:08 +0000)]
Merge "docs: site mipmap folder updates" into lmp-docs

9 years agoMerge "docs: studio mipmap update" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:06:45 +0000 (22:06 +0000)]
Merge "docs: studio mipmap update" into lmp-docs

9 years agoam 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:06:21 +0000 (22:06 +0000)]
am 8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs

* commit '8823b93d5c32bb7a8c757022ce055ca53b71171f':
  docs: studio proxy setting setup
  docs: studio proxy setup

9 years agoMerge changes If3a78fc7,Ifbe3f03a into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:02:44 +0000 (22:02 +0000)]
Merge changes If3a78fc7,Ifbe3f03a into lmp-docs

* changes:
  docs: studio proxy setting setup
  docs: studio proxy setup

9 years agoam fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
Oliver Woodman [Tue, 17 Feb 2015 20:53:13 +0000 (20:53 +0000)]
am fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs

* commit 'fe3e71befacc5d0777eb0c7099dd910197cfb6b6':
  Update ExoPlayer developer guide.

9 years agoMerge "Update ExoPlayer developer guide." into lmp-docs
Oliver Woodman [Tue, 17 Feb 2015 20:48:49 +0000 (20:48 +0000)]
Merge "Update ExoPlayer developer guide." into lmp-docs

9 years agoUpdate ExoPlayer developer guide.
Oliver Woodman [Mon, 16 Feb 2015 17:49:34 +0000 (17:49 +0000)]
Update ExoPlayer developer guide.

This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.

Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b

9 years agoam 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:42:44 +0000 (20:42 +0000)]
am 76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs

* commit '76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
  docs: studio revision 1-1

9 years agoMerge "docs: studio revision 1-1" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:37:51 +0000 (20:37 +0000)]
Merge "docs: studio revision 1-1" into lmp-docs

9 years agodocs: site mipmap folder updates
Rich Slogar [Mon, 9 Feb 2015 19:40:44 +0000 (11:40 -0800)]
docs: site mipmap folder updates

b/12874352

Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9

9 years agoam 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:19:59 +0000 (20:19 +0000)]
am 4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs

* commit '4abf87f134fa81460e018bb7130e88639281e1ce':
  docs: android plugin for gradle revisions page

9 years agoMerge "docs: android plugin for gradle revisions page" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:16:08 +0000 (20:16 +0000)]
Merge "docs: android plugin for gradle revisions page" into lmp-docs

9 years agoam 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it...
David Friedman [Sat, 14 Feb 2015 02:42:44 +0000 (02:42 +0000)]
am 03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs

* commit '03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
  This file is misplaced, and serves no purpose. I am sending it to oblivion.

9 years agoMerge "This file is misplaced, and serves no purpose. I am sending it to oblivion...
David Friedman [Sat, 14 Feb 2015 02:36:33 +0000 (02:36 +0000)]
Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs

9 years agodocs: studio mipmap update
Rich Slogar [Fri, 30 Jan 2015 23:25:21 +0000 (15:25 -0800)]
docs: studio mipmap update

Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d

9 years agodocs: studio proxy setting setup
Rich Slogar [Mon, 26 Jan 2015 19:08:55 +0000 (11:08 -0800)]
docs: studio proxy setting setup

b/18332702

Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825

9 years agodocs: studio revision 1-1
Rich Slogar [Tue, 10 Feb 2015 20:56:46 +0000 (12:56 -0800)]
docs: studio revision 1-1

Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a

9 years agodocs: android plugin for gradle revisions page
Rich Slogar [Thu, 15 Jan 2015 00:04:08 +0000 (16:04 -0800)]
docs: android plugin for gradle revisions page

Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255

9 years agoMerge "Add Asset management support for fonts." into lmp-dev
Deepanshu Gupta [Fri, 13 Feb 2015 22:34:17 +0000 (22:34 +0000)]
Merge "Add Asset management support for fonts." into lmp-dev

9 years agoMerge "Do not paint shadow if outside of the clip area" into lmp-dev
Diego Perez [Fri, 13 Feb 2015 22:34:14 +0000 (22:34 +0000)]
Merge "Do not paint shadow if outside of the clip area" into lmp-dev

9 years agoMerge "Changes made by intelliJ 14.1" into lmp-dev
Deepanshu Gupta [Fri, 13 Feb 2015 22:33:47 +0000 (22:33 +0000)]
Merge "Changes made by intelliJ 14.1" into lmp-dev

9 years agodocs: Fix issue with older devices section not expanding
Luan Nguyen [Fri, 13 Feb 2015 19:23:50 +0000 (11:23 -0800)]
docs: Fix issue with older devices section not expanding

bug: 19381237
Change-Id: I3d881f36b8aac6f6a845141b33e8e383356ffcb4

9 years agoThis file is misplaced, and serves no purpose. I am sending it to oblivion.
David Friedman [Fri, 13 Feb 2015 05:30:59 +0000 (21:30 -0800)]
This file is misplaced, and serves no purpose. I am sending it to oblivion.

Change-Id: I91ed7bc228849f3181591357037b368b4b261eee

9 years agodocs: Noted that purchaseToken is long and cannot be truncated.
Andrew Solovay [Sat, 7 Feb 2015 01:29:24 +0000 (17:29 -0800)]
docs: Noted that purchaseToken is long and cannot be truncated.

Noted in reference and integration doc that the token for Google Play
purchases may be up to 1,000 chars long, and the entire token must
be returned (not abbreviated or truncated) to any method that needs
it.

See first comment for doc stage location.

bug: 19099521
Change-Id: I0a0f187293ea522c218f6c3287b4c36ee6725a90

9 years agoam 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices...
Luan Nguyen [Thu, 12 Feb 2015 19:07:47 +0000 (19:07 +0000)]
am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs

* commit '8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
  docs: Update device art generator to include Wear generic devices.

9 years agoMerge "docs: Update device art generator to include Wear generic devices." into lmp...
Luan Nguyen [Thu, 12 Feb 2015 19:01:02 +0000 (19:01 +0000)]
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs

9 years agoam fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup...
Luan Nguyen [Thu, 12 Feb 2015 17:17:04 +0000 (17:17 +0000)]
am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs

* commit 'fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
  docs: Fix issue with onCreate() method declaration in file backup section

9 years agoam e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)"...
Luan Nguyen [Thu, 12 Feb 2015 17:16:59 +0000 (17:16 +0000)]
am e1f90b4e: Merge "docs: Fix notification api guide issues (746115412765600)" into lmp-docs

* commit 'e1f90b4e1e438c0086409ae0253a6452f2befbac':
  docs: Fix notification api guide issues (746115412765600)

9 years agoMerge "docs: Fix issue with onCreate() method declaration in file backup section...
Luan Nguyen [Thu, 12 Feb 2015 17:11:27 +0000 (17:11 +0000)]
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs

9 years agoMerge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:10:49 +0000 (17:10 +0000)]
Merge "docs: Fix notification api guide issues (746115412765600)" into lmp-docs

9 years agodocs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Tue, 10 Feb 2015 21:10:39 +0000 (13:10 -0800)]
docs: Fix issue with onCreate() method declaration in file backup section

bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5

9 years agodocs: Update device art generator to include Wear generic devices.
Luan Nguyen [Mon, 2 Feb 2015 20:17:40 +0000 (12:17 -0800)]
docs: Update device art generator to include Wear generic devices.

bug: 14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639

9 years agoCheck that bitmap's size does not exceed 32 bits. DO NOT MERGE
Leon Scroggins III [Mon, 9 Feb 2015 20:42:19 +0000 (15:42 -0500)]
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
(cherry picked from commit 89a2466a2a2859df5f29350117efd7f9d6a2e32f)

9 years agodocs: Fix notification api guide issues (7461154, 12765600)
Luan Nguyen [Tue, 3 Feb 2015 17:58:34 +0000 (09:58 -0800)]
docs: Fix notification api guide issues (746115412765600)

bug: 7461154
bug: 12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2

9 years agoam c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into...
Shanea King-Roberson [Tue, 10 Feb 2015 20:04:17 +0000 (20:04 +0000)]
am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs

* commit 'c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
  Adding videos for 5.0 changes and watch face development.

9 years agoMerge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Shanea King-Roberson [Tue, 10 Feb 2015 19:57:29 +0000 (19:57 +0000)]
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs

9 years agoam e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp...
Luan Nguyen [Tue, 10 Feb 2015 18:40:34 +0000 (18:40 +0000)]
am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs

* commit 'e49fbfa21ccdeba56001b48604524794acea119e':
  docs: Fix various issues with incorrect code samples.

9 years agoMerge "docs: Fix various issues with incorrect code samples." into lmp-docs
Luan Nguyen [Tue, 10 Feb 2015 18:31:29 +0000 (18:31 +0000)]
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs

9 years agoAdding videos for 5.0 changes and watch face development.
Eric Gilmore [Tue, 10 Feb 2015 18:29:36 +0000 (10:29 -0800)]
Adding videos for 5.0 changes and watch face development.

 On branch pilot-videos
 Changes to be committed:
modified:   docs/html/about/versions/android-5.0-changes.jd
modified:   docs/html/training/wearables/watch-faces/index.jd

Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b

9 years agoam c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into...
Eric Gilmore [Tue, 10 Feb 2015 17:45:47 +0000 (17:45 +0000)]
am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs

* commit 'c9dbaf0483b0274879164806297180d260689f1f':
  Doc change: refactor GCM docs to be platform-agnostic.

9 years agodocs: Fix various issues with incorrect code samples.
Luan Nguyen [Wed, 28 Jan 2015 17:30:28 +0000 (09:30 -0800)]
docs: Fix various issues with incorrect code samples.

bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac

9 years agoMerge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
Eric Gilmore [Tue, 10 Feb 2015 01:13:01 +0000 (01:13 +0000)]
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs

9 years agoDoc change: refactor GCM docs to be platform-agnostic.
kmccormick [Fri, 12 Dec 2014 23:00:37 +0000 (15:00 -0800)]
Doc change: refactor GCM docs to be platform-agnostic.

Fix for:

b/17733410

Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2

9 years agoam ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
Joe Fernandez [Sat, 7 Feb 2015 01:00:53 +0000 (01:00 +0000)]
am ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs

* commit 'ba20f98c88b754b3a69d55963275e20ab2fba6bf':
  docs: remove + annotations in version references

9 years agoMerge "docs: remove + annotations in version references" into lmp-docs
Joe Fernandez [Sat, 7 Feb 2015 00:55:16 +0000 (00:55 +0000)]
Merge "docs: remove + annotations in version references" into lmp-docs

9 years agoam e0852368: Fix a few typos in Parcel.java.
John Spurlock [Thu, 5 Feb 2015 20:18:03 +0000 (20:18 +0000)]
am e0852368: Fix a few typos in Parcel.java.

* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.

9 years agoFix a few typos in Parcel.java.
John Spurlock [Wed, 4 Feb 2015 20:47:40 +0000 (15:47 -0500)]
Fix a few typos in Parcel.java.

Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16

9 years agoChanges made by intelliJ 14.1
Deepanshu Gupta [Wed, 4 Feb 2015 19:16:52 +0000 (11:16 -0800)]
Changes made by intelliJ 14.1

Change-Id: Ia130266ad994ef327629db25a18f9d5702b983f4

9 years agoDo not paint shadow if outside of the clip area
Diego Perez [Wed, 4 Feb 2015 11:53:15 +0000 (11:53 +0000)]
Do not paint shadow if outside of the clip area

Change-Id: I064ccc1d1b206a29d9d0db1384782cb5dd5c65ca

9 years agoAdd Asset management support for fonts.
Deepanshu Gupta [Wed, 28 Jan 2015 02:35:46 +0000 (18:35 -0800)]
Add Asset management support for fonts.

Change-Id: I10ca67dcffe244667d4ae0bda65dbc1aa6691d50

9 years agodocs: note to install linux packages
Rich Slogar [Wed, 21 Jan 2015 18:38:38 +0000 (10:38 -0800)]
docs: note to install linux packages

b/2845850
b.android 98328

Change-Id: I23224f24cb0b42ec4ffb3829e2246628da140f8c

9 years agoam eba583e3: docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am eba583e3: docs: February 2015 Dashboard updates

* commit 'eba583e3930891f7a8a0e48a961a4a2471fc757c':
  docs: February 2015 Dashboard updates

9 years agodocs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates

Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282

9 years agoam 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage...
Jon Larimer [Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)]
am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':

9 years agoam 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
Joe Fernandez [Sat, 31 Jan 2015 01:59:54 +0000 (01:59 +0000)]
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs

* commit '1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
  docs: training intent doc error update

9 years agodocs: studio training basics create and run project updates
Rich Slogar [Mon, 15 Dec 2014 20:33:03 +0000 (12:33 -0800)]
docs: studio training basics create and run project updates

b/18742781

Change-Id: I80a207e24330c1b073934d671b3b9c94b0fb28e0

9 years agoMerge "docs: training intent doc error update" into lmp-docs
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs

9 years agodocs: training intent doc error update
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update

b/18386294

Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1

9 years agoMerge "Limited AppCompat support" into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:50:34 +0000 (00:50 +0000)]
Merge "Limited AppCompat support" into lmp-dev

9 years agoMerge "Resource resolution fixes." into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:48:56 +0000 (00:48 +0000)]
Merge "Resource resolution fixes." into lmp-dev

9 years agoam 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage...
Jon Larimer [Sat, 31 Jan 2015 00:05:54 +0000 (00:05 +0000)]
am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge: 5c9d0de

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation

9 years agoam 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs

* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
  docs: studio emulator platform update