OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 18 Mar 2015 15:37:10 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 15:00:13 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:47:44 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
Filip Gruszczynski [Tue, 17 Mar 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev

9 years agoam 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:36:19 +0000 (19:36 +0000)]
am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit '83419118e3c72311ef6b900457d1b03fd5c77883':
  Update vmSafeMode documentation

9 years agoam 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:29:20 +0000 (19:29 +0000)]
am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation

9 years agoMerge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev

9 years agoAdd animation to zeroing burn in protection.
Filip Gruszczynski [Mon, 16 Mar 2015 21:47:32 +0000 (14:47 -0700)]
Add animation to zeroing burn in protection.

Also don't shift immediately after starting ambient mode, but wait until
the first update.

Bug: 19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db

9 years agoMerge "Option for going home when going to sleep for devices without physical button...
Filip Gruszczynski [Tue, 17 Mar 2015 18:29:29 +0000 (18:29 +0000)]
Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

9 years agoam 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:36:05 +0000 (14:36 +0000)]
am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.

* commit '842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
  Fix AppCompat action bar theming.

9 years agoam 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:35:58 +0000 (14:35 +0000)]
am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.

* commit '38467b5fbbc09ad05624454f735d27ada25565c8':
  Fix NoActionBar themes rendering.

9 years agoam 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:37 +0000 (14:28 +0000)]
am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.

* commit '1f9a26af95abba385b612c734d1d5e32d9e3f363':
  Fix AppCompat action bar theming.

9 years agoam 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:33 +0000 (14:28 +0000)]
am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.

* commit '9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
  Fix NoActionBar themes rendering.

9 years agoam 158c08bc: am ada85905: Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am 158c08bc: am ada85905: Fix AppCompat action bar theming.

* commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
  Fix AppCompat action bar theming.

9 years agoam 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.

* commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
  Fix NoActionBar themes rendering.

9 years agoam ada85905: Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am ada85905: Fix AppCompat action bar theming.

* commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015':
  Fix AppCompat action bar theming.

9 years agoam 2e4d9324: Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 00:20:58 +0000 (00:20 +0000)]
am 2e4d9324: Fix NoActionBar themes rendering.

* commit '2e4d93245764a1c1d7515361ddbb8fc1665f814e':
  Fix NoActionBar themes rendering.

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 agoOption for going home when going to sleep for devices without physical button.
Filip Gruszczynski [Sat, 14 Mar 2015 00:39:31 +0000 (17:39 -0700)]
Option for going home when going to sleep for devices without physical button.

Bug: 19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47

9 years agoam 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 16 Mar 2015 13:07:29 +0000 (13:07 +0000)]
am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '74c66d10a7b2237f8aaf8c10675a10b9347860f4':
  Import translations. DO NOT MERGE

9 years agoam 57d39a3d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:07:26 +0000 (13:07 +0000)]
am 57d39a3d: (-s ours) Import translations. DO NOT MERGE

* commit '57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 16 Mar 2015 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:52:00 +0000 (05:52 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:50:19 +0000 (12:50 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:49:39 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:48:31 +0000 (05:48 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:35:33 +0000 (05:35 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:35:06 +0000 (07:35 -0500)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:31:48 +0000 (05:31 -0700)]
Import translations. DO NOT MERGE

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

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 agoam 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove...
Luan Nguyen [Fri, 13 Mar 2015 18:42:03 +0000 (18:42 +0000)]
am 0c89bdb7: am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs

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

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

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

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

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

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

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

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 agoam 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs...
Craig Mautner [Fri, 13 Mar 2015 00:46:51 +0000 (00:46 +0000)]
am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '7151b1ef4213207103a669602d6bb9502bc22a13':
  Correct docs to specify leading slash in paths.

9 years agoam 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify...
Craig Mautner [Fri, 13 Mar 2015 00:37:32 +0000 (00:37 +0000)]
am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '98560bdf87ad5f97054b13d3c92954132584c7f7':
  Correct docs to specify leading slash in paths.

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

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

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

* commit '2825a9c618840c1cf3d59806a794674f12a7c7c6':
  Correct docs to specify leading slash in paths.

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 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Thu, 12 Mar 2015 17:52:54 +0000 (17:52 +0000)]
am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.

* commit '11b6e2358aac68691f016fca07ee82be3e815f2b':
  Move Noto Sans Tai Le to the end of the font fallback list.

9 years agoam db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Thu, 12 Mar 2015 17:43:42 +0000 (17:43 +0000)]
am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.

* commit 'db56b5a681b097f7649937e8ad4d73c1e560fb3b':
  Move Noto Sans Tai Le to the end of the font fallback list.

9 years agoMove Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Wed, 11 Feb 2015 23:45:49 +0000 (15:45 -0800)]
Move Noto Sans Tai Le to the end of the font fallback list.

This is to make sure the East Asian punctuation shared between CJK languages
and Tai Le are rendered from the CJK fonts when no language is specified
for the text, or CJK text is rendered in a non-CJK locale.

Also remove the old comment about 64k glyphs limit.

Bug: 19355391
Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
(cherry picked from commit 70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)

9 years agoam e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView Layout...
Deepanshu Gupta [Thu, 12 Mar 2015 01:55:16 +0000 (01:55 +0000)]
am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

* commit 'e770c5e45a139d709976f8c1dbb821733968b5a8':
  Tools attribute improvements for RecyclerView LayoutManager.

9 years agoam c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager....
Deepanshu Gupta [Thu, 12 Mar 2015 01:41:57 +0000 (01:41 +0000)]
am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

* commit 'c44430a36813dc4afb6000279254e578bc5d0391':
  Tools attribute improvements for RecyclerView LayoutManager.

9 years agoMerge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 01:16:44 +0000 (01:16 +0000)]
Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

9 years agoam 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build...
Rich Slogar [Thu, 12 Mar 2015 01:07:20 +0000 (01:07 +0000)]
am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '4600588868b7df38084915793db8eeb38e90ca5a':
  docs: build image updates

9 years agoam f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency...
Deepanshu Gupta [Thu, 12 Mar 2015 00:59:39 +0000 (00:59 +0000)]
am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates...
Rich Slogar [Thu, 12 Mar 2015 00:59:35 +0000 (00:59 +0000)]
am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
  docs: build image updates

9 years agoam 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite...
Deepanshu Gupta [Thu, 12 Mar 2015 00:52:53 +0000 (00:52 +0000)]
am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit '71ba12308e338595d8068ff788bb5c8abfcfe515':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp...
Rich Slogar [Thu, 12 Mar 2015 00:52:49 +0000 (00:52 +0000)]
am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '633f482907d6c9cce672341f0d0a4d6c5c2b7f78':
  docs: build image updates

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

* commit '7256fb4fdd088cd0a827452cbdd8bd243da00881':
  docs: build image updates

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

* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:35 +0000 (00:45 +0000)]
am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be':
  Fix rare NPE in BridgeContext.

9 years agoam fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:31 +0000 (00:45 +0000)]
am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev

* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
  Fix project settings.

9 years agoam 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:27 +0000 (00:45 +0000)]
am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev

* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
  Add RecyclerView support.

9 years agoam b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:39:25 +0000 (00:39 +0000)]
am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
  Fix rare NPE in BridgeContext.

9 years agoam 71518174: Merge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:39:21 +0000 (00:39 +0000)]
am 71518174: Merge "Fix project settings." into lmp-mr1-dev

* commit '71518174fcd57c85d1e38f1794c44b763baff286':
  Fix project settings.

9 years agoam b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:39:16 +0000 (00:39 +0000)]
am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev

* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
  Add RecyclerView support.

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

* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.

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 agoMerge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:22 +0000 (00:32 +0000)]
Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

9 years agoMerge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:52 +0000 (00:31 +0000)]
Merge "Fix project settings." into lmp-mr1-dev

9 years agoMerge "Add RecyclerView support." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:49 +0000 (00:31 +0000)]
Merge "Add RecyclerView support." into lmp-mr1-dev

9 years agoTools attribute improvements for RecyclerView LayoutManager.
Deepanshu Gupta [Wed, 11 Mar 2015 23:48:20 +0000 (16:48 -0700)]
Tools attribute improvements for RecyclerView LayoutManager.

1. Change tools attribute for layout manager from layoutManagerType to
LayoutManager.
2. Support classnames in the tools attribute.

This change doesn't try to supprt arbitrary classnames for now. The
reason for this is that the new layoutlib API is supposed to contain a
new method for inflating custom classes that are not views. This will
allow us to throw better error messages. Without the new API, trying for
different constructors, will result in a error messages being logged.

Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa

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 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added...
Quddus Chong [Wed, 11 Mar 2015 23:47:54 +0000 (23:47 +0000)]
am 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs

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

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

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

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

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

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

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

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 agoFix rare NPE in BridgeContext.
Deepanshu Gupta [Wed, 11 Mar 2015 22:41:47 +0000 (15:41 -0700)]
Fix rare NPE in BridgeContext.

Also fixed some deprecation warnings.

Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d

9 years agoam a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs...
Luan Nguyen [Wed, 11 Mar 2015 19:19:31 +0000 (19:19 +0000)]
am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs

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

9 years agoam dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto...
Luan Nguyen [Wed, 11 Mar 2015 19:12:53 +0000 (19:12 +0000)]
am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs

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

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

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

9 years agoam 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update...
Luan Nguyen [Wed, 11 Mar 2015 17:42:58 +0000 (17:42 +0000)]
am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs

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

9 years agoam 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse...
Rich Slogar [Wed, 11 Mar 2015 17:42:54 +0000 (17:42 +0000)]
am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit '11558e5d2259a48604f494c540df72de34977ce5':
  docs: eclipse revisions update

9 years agoam 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions...
Andrew Solovay [Wed, 11 Mar 2015 17:42:50 +0000 (17:42 +0000)]
am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit '3d950de4d4028e0c7763932c00c372d41c832e87':
  docs: Revisions to "Providing Messaging for Auto"

9 years agoam 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing...
Luan Nguyen [Wed, 11 Mar 2015 17:32:01 +0000 (17:32 +0000)]
am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs

* commit '50a9b83554decb4913fc8eac9862edf902149265':
  docs: Update auto landing and design page image assets

9 years agoam 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions...
Rich Slogar [Wed, 11 Mar 2015 17:31:57 +0000 (17:31 +0000)]
am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit '8ab872dba1eff1477cb12da63d1f882260a271ae':
  docs: eclipse revisions update

9 years agoam a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing...
Andrew Solovay [Wed, 11 Mar 2015 17:31:53 +0000 (17:31 +0000)]
am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

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

9 years agoam 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design...
Luan Nguyen [Wed, 11 Mar 2015 17:18:43 +0000 (17:18 +0000)]
am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs

* commit '42ee70aac023da26a6dc4dee5856871372e792e8':
  docs: Update auto landing and design page image assets

9 years agoam dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into...
Rich Slogar [Wed, 11 Mar 2015 17:18:39 +0000 (17:18 +0000)]
am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
  docs: eclipse revisions update

9 years agoam 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for...
Andrew Solovay [Wed, 11 Mar 2015 17:18:23 +0000 (17:18 +0000)]
am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
  docs: Revisions to "Providing Messaging for Auto"

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

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

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 agoFix project settings.
Deepanshu Gupta [Wed, 11 Mar 2015 01:15:30 +0000 (18:15 -0700)]
Fix project settings.

1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166

9 years agoAdd RecyclerView support.
Deepanshu Gupta [Fri, 6 Mar 2015 02:38:37 +0000 (18:38 -0800)]
Add RecyclerView support.

Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e

9 years agoMake circular mask thickness configurable
Prashant Malani [Wed, 11 Feb 2015 03:09:39 +0000 (19:09 -0800)]
Make circular mask thickness configurable

Obtain the circular mask thickness as a dimension so that it can
be customized per-device.

Change-Id: Ied88f91424c5cf4f25dd1e78cf22f0fd7ea7b0a4
Signed-off-by: Prashant Malani <pmalani@google.com>
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 agoMerge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev
Justin Koh [Tue, 10 Mar 2015 20:37:05 +0000 (20:37 +0000)]
Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev

9 years agoAdd translatable=false to dozeComponent
Justin Koh [Tue, 10 Mar 2015 20:12:51 +0000 (13:12 -0700)]
Add translatable=false to dozeComponent

Add translatable=false to dozeComponent: this prevents it from breaking with
en_XA pseudolocalization.

Change-Id: I53a77d8590c65189633b89fed67d247115e75df9