Craig Mautner
2825a9c618
am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
...
* commit '470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
Correct docs to specify leading slash in paths.
2015-03-13 00:17:36 +00:00
Craig Mautner
470ad0fa1c
Merge "Correct docs to specify leading slash in paths." into lmp-docs
2015-03-13 00:09:31 +00:00
Olawale Ogunwale
1d67698bb4
am 53729e29: Merge "Wait for opening apps ready before stopping freezing display"
...
* commit '53729e2933540307b090e64ee89cbae26c67de8f':
Wait for opening apps ready before stopping freezing display
2015-03-12 21:38:41 +00:00
Olawale Ogunwale
2f95291689
am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"
...
* commit '1b4933d10eea59b091f263ebb3723f4d59a85d2b':
Wait for visible wallpaper drawn before starting app transitions
2015-03-12 21:38:30 +00:00
Roozbeh Pournader
8a264dd289
am 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
...
* commit '07e01e07bbfffa9e247a54dd96b3013de46d59e7':
Move Noto Sans Tai Le to the end of the font fallback list.
2015-03-12 21:33:35 +00:00
Mark Salyzyn
2018fd0251
logd: optimize statistics
...
logd reads /data/system/packages.xml (because it also contains
shared UIDs) and is sensitive to line break and tag name issues.
Bug: 19608965
Change-Id: I2a4a6bcfb10529e4b29c9664cbbf12842e689dd1
2015-03-12 20:29:32 +00:00
Vinod Krishnan
569635c57d
Make Theme.Micro point to Theme.Material
...
Bug: 18768870
Change-Id: I8dc8d1b539425da9ae7aaa71fa4de685dd1e75f0
2015-03-12 11:24:46 -07:00
Roozbeh Pournader
07e01e07bb
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.
2015-03-12 17:52:54 +00:00
Roozbeh Pournader
11b6e2358a
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.
2015-03-12 17:43:42 +00:00
Olawale Ogunwale
53729e2933
Merge "Wait for opening apps ready before stopping freezing display"
2015-03-12 16:51:19 +00:00
Olawale Ogunwale
1b4933d10e
Merge "Wait for visible wallpaper drawn before starting app transitions"
2015-03-12 16:22:07 +00:00
Roozbeh Pournader
db56b5a681
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)
2015-03-12 15:45:32 +00:00
Lorenzo Colitti
4a61eaf784
am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/ "
...
* commit '1c24b3f110e0521a3840c3dfce9a86343fa02672':
Fix build, broken by https://android-review.googlesource.com/#/c/115890/
2015-03-12 08:00:53 +00:00
Lorenzo Colitti
1c24b3f110
Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/ "
2015-03-12 07:49:23 +00:00
Lorenzo Colitti
7b5be4c0c7
Fix build, broken by https://android-review.googlesource.com/#/c/115890/
...
Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5
2015-03-12 16:48:12 +09:00
Lorenzo Colitti
b6b9fe216d
am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."
...
* commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8':
Remove dead code, mostly DataStateTracker.
2015-03-12 07:38:50 +00:00
Lorenzo Colitti
2f196e6c81
Merge "Remove dead code, mostly DataStateTracker."
2015-03-12 07:27:27 +00:00
Deepanshu Gupta
a4277e1493
am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
...
* commit 'a4ed5e94117a2c6c1734138faed09490245c602f':
Tools attribute improvements for RecyclerView LayoutManager.
2015-03-12 02:01:57 +00:00
Deepanshu Gupta
a4ed5e9411
am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
...
* commit 'e770c5e45a139d709976f8c1dbb821733968b5a8':
Tools attribute improvements for RecyclerView LayoutManager.
2015-03-12 01:55:16 +00:00
Deepanshu Gupta
e770c5e45a
am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
...
* commit 'c44430a36813dc4afb6000279254e578bc5d0391':
Tools attribute improvements for RecyclerView LayoutManager.
2015-03-12 01:41:57 +00:00
Deepanshu Gupta
c44430a368
Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
2015-03-12 01:16:45 +00:00
Rich Slogar
93d44992ec
am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
...
* commit '1a27a3fb4eceefcf412218d73de0cff0cc68c67d':
docs: build image updates
2015-03-12 01:14:21 +00:00
Deepanshu Gupta
3d024d4c22
am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
...
* commit '65215edd7acada70c2bcb060daec6ff718ae92ba':
Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 01:08:57 +00:00
Rich Slogar
1a27a3fb4e
am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
...
* commit '4600588868b7df38084915793db8eeb38e90ca5a':
docs: build image updates
2015-03-12 01:07:20 +00:00
Deepanshu Gupta
65215edd7a
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.
2015-03-12 00:59:39 +00:00
Rich Slogar
4600588868
am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
...
* commit '0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
docs: build image updates
2015-03-12 00:59:35 +00:00
Deepanshu Gupta
fceec0e124
am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
...
* commit 'c7fc094d319998572087e983e21c62de9f318139':
Fix rare NPE in BridgeContext.
2015-03-12 00:56:52 +00:00
Deepanshu Gupta
ca9264eab0
am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
...
* commit 'a695f87db757e89ee99d3c672037b479dce3e4e7':
Fix project settings.
2015-03-12 00:56:47 +00:00
Deepanshu Gupta
ef1741d27b
am 05cba2f8: am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
...
* commit '05cba2f8acd88d40e1bb149915fe590d4a21b74d':
Add RecyclerView support.
2015-03-12 00:56:41 +00:00
Deepanshu Gupta
f0d324e531
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.
2015-03-12 00:52:53 +00:00
Rich Slogar
0146922a6f
am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
...
* commit '633f482907d6c9cce672341f0d0a4d6c5c2b7f78':
docs: build image updates
2015-03-12 00:52:49 +00:00
Rich Slogar
633f482907
am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
...
* commit '7256fb4fdd088cd0a827452cbdd8bd243da00881':
docs: build image updates
2015-03-12 00:45:40 +00:00
Deepanshu Gupta
71ba12308e
am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
...
* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:45:40 +00:00
Deepanshu Gupta
c7fc094d31
am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
...
* commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be':
Fix rare NPE in BridgeContext.
2015-03-12 00:45:35 +00:00
Deepanshu Gupta
a695f87db7
am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
...
* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
Fix project settings.
2015-03-12 00:45:31 +00:00
Deepanshu Gupta
05cba2f8ac
am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
...
* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
Add RecyclerView support.
2015-03-12 00:45:27 +00:00
Deepanshu Gupta
d44af6108b
am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
...
* commit 'b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
Fix rare NPE in BridgeContext.
2015-03-12 00:39:25 +00:00
Deepanshu Gupta
fa3c665019
am 71518174: Merge "Fix project settings." into lmp-mr1-dev
...
* commit '71518174fcd57c85d1e38f1794c44b763baff286':
Fix project settings.
2015-03-12 00:39:21 +00:00
Deepanshu Gupta
338a5a88fe
am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
...
* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
Add RecyclerView support.
2015-03-12 00:39:16 +00:00
Deepanshu Gupta
efc09c644f
am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
...
* commit '78660423900fa255cc83b85320e98d5184be393b':
Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:38:45 +00:00
Rich Slogar
7256fb4fdd
am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
...
* commit 'a6b0ddb7f1437d67538364f16dedb61f7966c653':
docs: build image updates
2015-03-12 00:38:38 +00:00
Rich Slogar
a6b0ddb7f1
Merge "docs: build image updates" into lmp-docs
2015-03-12 00:34:10 +00:00
Deepanshu Gupta
7866042390
Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
2015-03-12 00:32:55 +00:00
Deepanshu Gupta
b3cfb33489
Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
2015-03-12 00:32:32 +00:00
Deepanshu Gupta
71518174fc
Merge "Fix project settings." into lmp-mr1-dev
2015-03-12 00:31:54 +00:00
Deepanshu Gupta
b171be1a54
Merge "Add RecyclerView support." into lmp-mr1-dev
2015-03-12 00:31:50 +00:00
Deepanshu Gupta
0412b317ac
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
2015-03-11 17:26:48 -07:00
Deepanshu Gupta
5521f65ecb
Fix cyclic dependency in BlendComposite and BlendingMode.
...
Introduced in commit 1a10ca7e526736b4fd143f7c9f3b29643c0062a4
Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
2015-03-11 17:04:21 -07:00
Quddus Chong
d93f4c8bef
am 0d258a93: 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 '0d258a93ad6cee573081e2060806c95524474de5':
docs: Added overview page and Javadocs for the Android Testing Support Library.
2015-03-11 23:57:40 +00:00
Quddus Chong
0d258a93ad
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.
2015-03-11 23:47:54 +00:00