OSDN Git Service

android-x86/frameworks-base.git
9 years agoam cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious...
Andrew Solovay [Thu, 19 Mar 2015 01:17:17 +0000 (01:17 +0000)]
am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

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

9 years agoam a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image...
Andrew Solovay [Thu, 19 Mar 2015 01:17:11 +0000 (01:17 +0000)]
am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

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

9 years agoam 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation...
Andrew Solovay [Thu, 19 Mar 2015 00:55:08 +0000 (00:55 +0000)]
am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs

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

9 years agoam 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and...
Andrew Solovay [Thu, 19 Mar 2015 00:55:01 +0000 (00:55 +0000)]
am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

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

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

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

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

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

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: 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 agoam c2eb5c60: Merge "Prevent activities from being started during setup wizard." into...
Bart Sears [Wed, 18 Mar 2015 20:30:15 +0000 (20:30 +0000)]
am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev

* commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4':
  Prevent activities from being started during setup wizard.

9 years agoMerge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
Bart Sears [Wed, 18 Mar 2015 20:21:57 +0000 (20:21 +0000)]
Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev

9 years agoam b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
Dan Sandler [Wed, 18 Mar 2015 18:28:31 +0000 (18:28 +0000)]
am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev

* commit 'b3a1b6632e403926fed995e851a8e44fc944c663':
  Avoid crashing on corrupted notifications.

9 years agoMerge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
Dan Sandler [Wed, 18 Mar 2015 18:23:19 +0000 (18:23 +0000)]
Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev

9 years agoam 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:35:02 +0000 (17:35 +0000)]
am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2

* commit '8d3f587f15016d193e4739e3893b77e11336b498':
  docs: downloads for sdk 24.1.2

9 years agoam 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:27:29 +0000 (17:27 +0000)]
am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2

* commit '57c24fbb90dd7b342b06e2daecc1033f92d730da':
  docs: downloads for sdk 24.1.2

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

* commit '2fc33a008c02cf408e1d270972bbf681c7a36785':
  docs: downloads for sdk 24.1.2

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 agoMerge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev
Pierre Vandwalle [Tue, 17 Mar 2015 22:29:30 +0000 (22:29 +0000)]
Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev

9 years agoam 89f41eb3: Define the capability to speed up MT call audio
Dong Zhou [Tue, 17 Mar 2015 22:21:21 +0000 (22:21 +0000)]
am 89f41eb3: Define the capability to speed up MT call audio

* commit '89f41eb39e910e220957ac861651ead17eff9085':
  Define the capability to speed up MT call audio

9 years agoDefine the capability to speed up MT call audio
Dong Zhou [Sun, 15 Mar 2015 16:59:49 +0000 (11:59 -0500)]
Define the capability to speed up MT call audio

Bug: 19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d

9 years agoam 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:29:38 +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 agoMerge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1...
Pavel Zhamaitsiak [Tue, 17 Mar 2015 18:28:34 +0000 (18:28 +0000)]
Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev

9 years agoAvoid crashing on corrupted notifications.
Dan Sandler [Wed, 25 Feb 2015 18:20:39 +0000 (13:20 -0500)]
Avoid crashing on corrupted notifications.

If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.

Bug: 19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4

9 years agoam 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:36 +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:32 +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 agoPrevent activities from being started during setup wizard.
Michael Wright [Thu, 12 Mar 2015 23:23:05 +0000 (16:23 -0700)]
Prevent activities from being started during setup wizard.

Bug: 19677145
Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654

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 agoexport API to disable autojoin scan initial implementation
Pierre Vandwalle [Fri, 13 Mar 2015 20:58:53 +0000 (13:58 -0700)]
export API to disable autojoin scan initial implementation

Change-Id: I28e268dd8b859a3a22c3d6f699216bbd7124af26

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 agoAdd format string for displaying SPN in Wi-Fi calling mode.
Pavel Zhamaitsiak [Thu, 12 Mar 2015 00:09:13 +0000 (17:09 -0700)]
Add format string for displaying SPN in Wi-Fi calling mode.

Bug: 19681794
Change-Id: I31feab956d14accda73288cd43a2aa34db7175ae

9 years agoam 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated...
Luan Nguyen [Fri, 13 Mar 2015 18:28:32 +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 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify...
Craig Mautner [Fri, 13 Mar 2015 00:38:53 +0000 (00:38 +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 agoMerge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
Nathan Harold [Thu, 12 Mar 2015 21:37:44 +0000 (21:37 +0000)]
Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev

9 years agoam db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Thu, 12 Mar 2015 17:41:20 +0000 (17:41 +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 c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager....
Deepanshu Gupta [Thu, 12 Mar 2015 01:45:25 +0000 (01:45 +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 agoAdding hidden isWifiCallingEnabled() and isVolteEnabled()
Nathan Harold [Thu, 12 Mar 2015 01:08:08 +0000 (18:08 -0700)]
Adding hidden isWifiCallingEnabled() and isVolteEnabled()

Change-Id: Ic33f8c50dfb2d81b2bdc149629724e3972aad09e

9 years agoam 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates...
Rich Slogar [Thu, 12 Mar 2015 00:59:36 +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:53:12 +0000 (00:53 +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 b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:14 +0000 (00:46 +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:46:10 +0000 (00:46 +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:46:07 +0000 (00:46 +0000)]
am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev

* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
  Add RecyclerView support.

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 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page...
Quddus Chong [Thu, 12 Mar 2015 00:41:08 +0000 (00:41 +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 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 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 dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto...
Luan Nguyen [Wed, 11 Mar 2015 19:13:06 +0000 (19:13 +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 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing...
Luan Nguyen [Wed, 11 Mar 2015 17:31:34 +0000 (17:31 +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:30 +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:26 +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 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 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image...
Luan Nguyen [Tue, 10 Mar 2015 19:28:57 +0000 (19:28 +0000)]
am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs

* commit '24b4e5729ed917dc2831a111f917d0a5fbd4e4d0':
  docs: Update auto landing and design page image assets

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

* commit '08ddf132bfb2117d49ea3ca70861a227c39e8115':
  docs: eclipse revisions update

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 "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:22:16 +0000 (19:22 +0000)]
Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev

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