OSDN Git Service
Bryce Lee [Thu, 19 Mar 2015 00:14:06 +0000 (00:14 +0000)]
Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
Nick Vaccaro [Wed, 18 Mar 2015 23:37:51 +0000 (23:37 +0000)]
Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev
Bart Sears [Wed, 18 Mar 2015 21:12:10 +0000 (14:12 -0700)]
resolved conflicts for merge of
cc86bc0c to lmp-mr1-modular-dev
Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93
Bart Sears [Wed, 18 Mar 2015 20:28:59 +0000 (20:28 +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.
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
Dan Sandler [Wed, 18 Mar 2015 18:35:20 +0000 (18:35 +0000)]
am
76620791: am
b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit '
76620791600af3b3d6f6ad8ba3534320265153db':
Avoid crashing on corrupted notifications.
Dan Sandler [Wed, 18 Mar 2015 18:29:48 +0000 (18:29 +0000)]
am
b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit '
b3a1b6632e403926fed995e851a8e44fc944c663':
Avoid crashing on corrupted notifications.
Dan Sandler [Wed, 18 Mar 2015 18:23:19 +0000 (18:23 +0000)]
Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
Rich Slogar [Wed, 18 Mar 2015 17:41:28 +0000 (17:41 +0000)]
am
96693b29: am
8d3f587f: am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
96693b29774713d156fd035cda174cfd7b4d9b65':
docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:35:46 +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
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
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
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
Geoff Mendal [Wed, 18 Mar 2015 16:54:56 +0000 (16:54 +0000)]
am
54064f66: (-s ours) Import translations. DO NOT MERGE
* commit '
54064f66c949fa4069b4abb025c31afe28ac98ab':
Import translations. DO NOT MERGE
Dong Zhou [Wed, 18 Mar 2015 16:54:37 +0000 (16:54 +0000)]
am
94573dc5: am
89f41eb3: Define the capability to speed up MT call audio
* commit '
94573dc5515d69458effc92b66922f757adde4d0':
Define the capability to speed up MT call audio
Kenny Root [Wed, 18 Mar 2015 16:54:33 +0000 (16:54 +0000)]
am
4ff668d4: Track change to Conscrypt
* commit '
4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
Track change to Conscrypt
Kenny Root [Wed, 18 Mar 2015 16:54:29 +0000 (16:54 +0000)]
am
fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
* commit '
fbd8805cd783e34aebf521913aeab6cfd483b7b2':
Track change to Conscrypt
Geoff Mendal [Wed, 18 Mar 2015 15:37:10 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
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
Geoff Mendal [Wed, 18 Mar 2015 13:04:44 +0000 (06:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd3f512fcd1aabd685f10218eceda8f4f83bb116
Auto-generated-cl: translation import
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
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
Dong Zhou [Tue, 17 Mar 2015 22:28:22 +0000 (22:28 +0000)]
am
89f41eb3: Define the capability to speed up MT call audio
* commit '
89f41eb39e910e220957ac861651ead17eff9085':
Define the capability to speed up MT call audio
Kenny Root [Wed, 26 Nov 2014 17:08:40 +0000 (09:08 -0800)]
Track change to Conscrypt
(cherry picked from commit
9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)
Bug:
19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
Kenny Root [Tue, 17 Mar 2015 22:21:52 +0000 (22:21 +0000)]
Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
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
Kenny Root [Fri, 31 Oct 2014 17:28:04 +0000 (10:28 -0700)]
Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.
(cherry picked from commit
8a970637208207955fb6a719bd82902384b3c743)
Bug:
19798387
Bug:
17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
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
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
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
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
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
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
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
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.
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.
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.
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.
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.
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.
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.
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.
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
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
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
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
Geoff Mendal [Mon, 16 Mar 2015 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
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
Geoff Mendal [Mon, 16 Mar 2015 12:50:19 +0000 (12:50 +0000)]
Merge "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
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
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
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
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
Bryce Lee [Sat, 14 Mar 2015 14:57:48 +0000 (07:57 -0700)]
Add Assist global action for wear to different from VOICE_ASSIST
Bug:
19722315
Change-Id: I0b1e5625a2eaabfe0015a4d730b25e84d60a3714
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
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
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
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
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
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
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
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
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.
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.
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.
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.
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.
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
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.
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.
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)
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.
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.
Deepanshu Gupta [Thu, 12 Mar 2015 01:16:44 +0000 (01:16 +0000)]
Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
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
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.
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
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.
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
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
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.
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.
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.
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.
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.
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.
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.
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.
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
Rich Slogar [Thu, 12 Mar 2015 00:34:09 +0000 (00:34 +0000)]
Merge "docs: build image updates" into lmp-docs
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:45 +0000 (00:32 +0000)]
Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:22 +0000 (00:32 +0000)]
Merge "Fix rare NPE in BridgeContext." 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
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:49 +0000 (00:31 +0000)]
Merge "Add RecyclerView support." into lmp-mr1-dev
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
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
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.
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.
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.
OSDN Git Service
