OSDN Git Service
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:54 +0000 (01:55 +0000)]
am
15dd3802: am
b9d2a529: am
e4acf0ad: (-s ours) am
ad16968d: am
6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
* commit '
15dd38029e3d6ce874016a0e9bd29b71e4b46cea':
LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:47 +0000 (01:55 +0000)]
am
74f88968: am
637eacfd: am
7911c8b9: (-s ours) am
15e549a8: am
4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
* commit '
74f889684521f45559ee5c07bfbcb76033738e01':
Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:42 +0000 (01:55 +0000)]
am
1d1fae81: am
8cafc782: am
13670bc6: (-s ours) am
669e4969: am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
1d1fae8141e3dd6a6e00d12a470fa318945465ce':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:35 +0000 (01:55 +0000)]
am
a62ad156: am
57185503: am
6dc8bab9: (-s ours) am
c0fd1316: am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
a62ad1565aaa7c3c80b2c9a71cebded0c1245ec4':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:29 +0000 (01:55 +0000)]
am
26bdd0c8: am
e779dec0: am
bf7907bf: (-s ours) am
6b836cd0: am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
26bdd0c8a223d7e0b0da49b64cca1d62a2635740':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:23 +0000 (01:55 +0000)]
am
ec160c67: am
42872f73: am
f2bf5470: (-s ours) am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
ec160c67543badf481c95ab04de721e476c0b390':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:16 +0000 (01:55 +0000)]
am
0b95542d: am
35f6976e: am
7ec7805a: (-s ours) am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
0b95542d1be4cfcb6b26443c7dafc29716035528':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:09 +0000 (01:55 +0000)]
am
c0a9faad: am
dc78e108: am
594939fc: (-s ours) am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
c0a9faad42fd8212f8142ba1363a992095bb645c':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:02 +0000 (01:55 +0000)]
am
f3696835: am
0ae85775: am
bd343c1f: (-s ours) am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
f36968355d1fbe725c762fd02ed5e12ecf759add':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:55 +0000 (01:54 +0000)]
am
b602943f: am
7d7f0f47: am
9b1ac269: (-s ours) am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
b602943f0d39487a54b279109af0c40784469d5e':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:49 +0000 (01:54 +0000)]
am
0f0cae1a: am
fcc62127: am
6b7f9ae6: (-s ours) am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
0f0cae1a269a02cb7f4645dfc2f70cbe50c7be86':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:44 +0000 (01:54 +0000)]
am
14be8ed3: am
e3040e9a: am
d6363d86: (-s ours) am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
14be8ed3b4ac1abac6086a097f86e41ad2b8518c':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:38 +0000 (01:54 +0000)]
am
2c1cc061: am
56c72f4c: am
5b886bb0: (-s ours) am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
2c1cc0610923e5491d1ea8230ed89018fdea1fec':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:33 +0000 (01:54 +0000)]
am
4b030f0b: am
720d677f: am
aae9c930: (-s ours) am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
4b030f0bb3449538cb8a8a97612ab29c5ae25dd5':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:26 +0000 (01:54 +0000)]
am
bf2c3b67: am
ef319302: am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
bf2c3b679018d4a993a370e998b5e3276d052045':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:20 +0000 (01:54 +0000)]
am
8053ef0c: am
a6d71a2c: am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
8053ef0c0120295d53469b14e6e1fcf748640bea':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:14 +0000 (01:54 +0000)]
am
48aea8cc: am
df44516b: am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
48aea8cc12ea7606b36bc474f91891f463554ef8':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:54:01 +0000 (01:54 +0000)]
am
ac5f66e3: am
bf019327: am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
ac5f66e32efd43801c314114bfff28668f598a4d':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:53:55 +0000 (01:53 +0000)]
am
8affffc7: am
ef284578: am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
8affffc7823c879ae080292591abcec272e1850d':
Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:35 +0000 (01:43 +0000)]
am
b9d2a529: am
e4acf0ad: (-s ours) am
ad16968d: am
6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
* commit '
b9d2a529952d3ee0edd483bf19b59a080dcd9c98':
LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:31 +0000 (01:43 +0000)]
am
637eacfd: am
7911c8b9: (-s ours) am
15e549a8: am
4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
* commit '
637eacfdb4d2b499806f4a1b3b5ebab78b5f3bca':
Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:26 +0000 (01:43 +0000)]
am
8cafc782: am
13670bc6: (-s ours) am
669e4969: am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
8cafc782d8763b0bc9044c21595026707828596b':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:22 +0000 (01:43 +0000)]
am
57185503: am
6dc8bab9: (-s ours) am
c0fd1316: am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
57185503a11d8509a432c673a1cb38d5efd6aacf':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:17 +0000 (01:43 +0000)]
am
e779dec0: am
bf7907bf: (-s ours) am
6b836cd0: am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
e779dec0ab98637a4269bcd2a8cdd9c0e2e01bf2':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:13 +0000 (01:43 +0000)]
am
42872f73: am
f2bf5470: (-s ours) am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
42872f7342f49a58ecee62d547e8a074b9321871':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:05 +0000 (01:43 +0000)]
am
35f6976e: am
7ec7805a: (-s ours) am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
35f6976e10d04dd6fc6576895689b3327250cdc4':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:00 +0000 (01:43 +0000)]
am
dc78e108: am
594939fc: (-s ours) am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
dc78e1080ed5c37b3ed8b633c025421d584a0aed':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:56 +0000 (01:42 +0000)]
am
0ae85775: am
bd343c1f: (-s ours) am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
0ae857751caf4ecec16e164ca7a0e5a35eab8764':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:52 +0000 (01:42 +0000)]
am
7d7f0f47: am
9b1ac269: (-s ours) am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
7d7f0f4731b9908117cf157ee3fbf992d9e09c6d':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:49 +0000 (01:42 +0000)]
am
fcc62127: am
6b7f9ae6: (-s ours) am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
fcc6212778590a9d22379f21b414c4ee1e1bf7c2':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:45 +0000 (01:42 +0000)]
am
e3040e9a: am
d6363d86: (-s ours) am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
e3040e9a737b442a7860eaaafb691c780f3d0ce6':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:41 +0000 (01:42 +0000)]
am
56c72f4c: am
5b886bb0: (-s ours) am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
56c72f4c50556fc3072460fedf83145d73eb6f96':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:37 +0000 (01:42 +0000)]
am
720d677f: am
aae9c930: (-s ours) am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
720d677fc29fdaaa8aed14f7eb1f0137cec5c3e9':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:32 +0000 (01:42 +0000)]
am
ef319302: am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
ef31930253fe9c0b0cc7d42c0f11181ffe69ea1b':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:26 +0000 (01:42 +0000)]
am
a6d71a2c: am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
a6d71a2c37fbf4357ddb084ed5050c27826514ac':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:22 +0000 (01:42 +0000)]
am
df44516b: am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
df44516b78b6dd3c2ae5849a07a6e07e9302b668':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:18 +0000 (01:42 +0000)]
am
bf019327: am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
bf01932797aa5ae8d94643b7861b45c89364b2ba':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:13 +0000 (01:42 +0000)]
am
ef284578: am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
ef284578ee3b77890bcb45bbd1f89a5d244bced1':
Remove kxml dependency [DO NOT MERGE]
Tim Kilbourn [Thu, 27 Aug 2015 01:35:53 +0000 (01:35 +0000)]
am
487cdebd: am
8f1ea834: Handle the -a flag for dumpsys appops.
* commit '
487cdebd9038e2fe76165498e98dee2c08a9f11c':
Handle the -a flag for dumpsys appops.
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:14 +0000 (01:30 +0000)]
am
e4acf0ad: (-s ours) am
ad16968d: am
6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
* commit '
e4acf0ad4a83b22ea0ac4ecc23b41864df84714a':
LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:08 +0000 (01:30 +0000)]
am
7911c8b9: (-s ours) am
15e549a8: am
4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
* commit '
7911c8b97d1c11de96e5fe3495d5e3cb979d0f9f':
Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:02 +0000 (01:30 +0000)]
am
13670bc6: (-s ours) am
669e4969: am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
13670bc6dea025bfd9b35c604547fe2b0bd2047a':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:50 +0000 (01:29 +0000)]
am
6dc8bab9: (-s ours) am
c0fd1316: am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
6dc8bab993c55d239bc42822eb9a8003f7803dfd':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:43 +0000 (01:29 +0000)]
am
bf7907bf: (-s ours) am
6b836cd0: am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
bf7907bfc855478c16650e77a7a8a72370c6f35f':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:36 +0000 (01:29 +0000)]
am
f2bf5470: (-s ours) am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
f2bf5470a3ec1f5eb8584e0d7c1a8eb3c08d8d20':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:30 +0000 (01:29 +0000)]
am
7ec7805a: (-s ours) am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
7ec7805a50893be6242a41de01299cb1de44b461':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:19 +0000 (01:29 +0000)]
am
594939fc: (-s ours) am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
594939fc07e83445ef4507df6fcd457069352189':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:10 +0000 (01:29 +0000)]
am
bd343c1f: (-s ours) am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
bd343c1fbf05087094e1dbf40048137e3a3e08fa':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:05 +0000 (01:29 +0000)]
am
9b1ac269: (-s ours) am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
9b1ac26921b9c7aaf3c43c8094d81cfabc5cc085':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:58 +0000 (01:28 +0000)]
am
6b7f9ae6: (-s ours) am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
6b7f9ae6f56375b1bd84f31206cac179e09b8146':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:48 +0000 (01:28 +0000)]
am
d6363d86: (-s ours) am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
d6363d86060126e20b913dcd6db3c5cc2019804c':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:42 +0000 (01:28 +0000)]
am
5b886bb0: (-s ours) am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
5b886bb08ff59e405c365db51abf71999e8f6c93':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:35 +0000 (01:28 +0000)]
am
aae9c930: (-s ours) am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
aae9c9309ca5155124f740b10a40c68b09ed0ce6':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
522e67e4ac600fb19c18f55f0e51096af9ae37d3':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:14 +0000 (01:28 +0000)]
am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
8df6131ac103ac58ab03f6aae01e136df3c6a7b1':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:07 +0000 (01:28 +0000)]
am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
59f026e937e749a77f12614010f8be05123f4837':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:52 +0000 (01:27 +0000)]
am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
b44f7fda759394b6447f19c0b3c9a3fdf8f9cd95':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:45 +0000 (01:27 +0000)]
am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
78d77bc379f42dfe020cf0719ceae14174cf1c33':
Remove kxml dependency [DO NOT MERGE]
Tim Kilbourn [Thu, 27 Aug 2015 01:15:58 +0000 (01:15 +0000)]
am
8f1ea834: Handle the -a flag for dumpsys appops.
* commit '
8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8':
Handle the -a flag for dumpsys appops.
Tim Kilbourn [Wed, 26 Aug 2015 22:07:37 +0000 (15:07 -0700)]
Handle the -a flag for dumpsys appops.
Bug:
23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
Roshan Pius [Wed, 26 Aug 2015 21:24:28 +0000 (21:24 +0000)]
am
6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
* commit '
6ad123156e762a62616de63617ee11afb3cde334':
Reformat local Korean numbers in national format.
Daniel Estrada Alva [Wed, 26 Aug 2015 21:19:30 +0000 (21:19 +0000)]
am
47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
* commit '
47ee2ecf82958f211c775a4125968fbf505fe594':
Disable AR HW when client binder dies.
Roshan Pius [Wed, 26 Aug 2015 21:15:16 +0000 (21:15 +0000)]
Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 21:09:50 +0000 (21:09 +0000)]
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
Alan Viverette [Wed, 26 Aug 2015 20:57:07 +0000 (20:57 +0000)]
am
b9b57225: am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
b9b57225c28cdec5a8b7c2a6353f40a66010c0ed':
Avoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 20:45:26 +0000 (20:45 +0000)]
am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
9513785715e2325ee3a3269fbfe7b1f4409eff5c':
Avoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 20:38:53 +0000 (20:38 +0000)]
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
Deepanshu Gupta [Wed, 26 Aug 2015 20:20:05 +0000 (20:20 +0000)]
am
ad16968d: am
6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE]
* commit '
ad16968d506840a1c1824c4ab6b5c181c8e04086':
LayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:58 +0000 (20:19 +0000)]
am
15e549a8: am
4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]
* commit '
15e549a81f59daf016f29c6ed6f1aa3d5f65d41c':
Skip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:52 +0000 (20:19 +0000)]
am
669e4969: am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
669e4969a7245cf9d1febc5d4e67a0f2063e87fb':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:39 +0000 (20:19 +0000)]
am
c0fd1316: am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
c0fd131642f21eabec570147cf9f4116c900e8a0':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:32 +0000 (20:19 +0000)]
am
6b836cd0: am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
6b836cd06b1a2ebe5d31336486bb1b54e42439df':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:23 +0000 (20:19 +0000)]
am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
91e456d235256c385a7da1e45f098386bc68e86a':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:13 +0000 (20:19 +0000)]
am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:05 +0000 (20:19 +0000)]
am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
66d5f24df0c3627028812ee23da8d4f08cc83e5c':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:54 +0000 (20:18 +0000)]
am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
b32e44ff0c5fd410720bb28c87bc9cea83556edf':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:47 +0000 (20:18 +0000)]
am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
1754824c2835d6f3a17c4a2c0ab668991797fcf9':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:34 +0000 (20:18 +0000)]
am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
678f0ea2ba47f06387670e9f75b13637a6446899':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:27 +0000 (20:18 +0000)]
am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
2e57c1e23f43bb0ede6280720559ccc1e866024b':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:15 +0000 (20:18 +0000)]
am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:09 +0000 (20:18 +0000)]
am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
2f50403fe0a8a035757b047af00c7520fadb9015':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:04 +0000 (20:18 +0000)]
am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:51 +0000 (20:17 +0000)]
am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
50e1406a4ad668179a9a3d28c58d68c0eee44237':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:46 +0000 (20:17 +0000)]
am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
81990c3f988369c755590288b93508e30024c56c':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:40 +0000 (20:17 +0000)]
am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
0a07bb95a1dd94c3457860a934d3ee546919cff2':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
Remove kxml dependency [DO NOT MERGE]
Alan Viverette [Wed, 26 Aug 2015 19:21:39 +0000 (15:21 -0400)]
Avoid NPE when getPositionForView() is called on detached view
Bug:
23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
Chien-Yu Chen [Wed, 26 Aug 2015 19:20:32 +0000 (19:20 +0000)]
am
fd059b34: am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
fd059b34fa81552934a194f845f114d1d89f87db':
Camera: Update for reprocess session
Chien-Yu Chen [Wed, 26 Aug 2015 19:07:52 +0000 (19:07 +0000)]
am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
Camera: Update for reprocess session
Chien-Yu Chen [Wed, 26 Aug 2015 18:56:15 +0000 (18:56 +0000)]
Merge "Camera: Update for reprocess session" into mnc-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:32:01 +0000 (18:32 +0000)]
am
59af87c2: am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
59af87c2b694fad361c5f7e053a19bf9e1483afa':
Add GET_APP_OPS_STATS to Shell
Selim Cinek [Wed, 26 Aug 2015 18:31:56 +0000 (18:31 +0000)]
am
e67268e6: Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
* commit '
e67268e66d5507832fa0c53dc7e08a72662610bc':
Migrate camera vibration to the systemUI
Nicholas Sauer [Wed, 26 Aug 2015 18:25:26 +0000 (18:25 +0000)]
am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
Add GET_APP_OPS_STATS to Shell
Selim Cinek [Wed, 26 Aug 2015 18:25:07 +0000 (18:25 +0000)]
Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:17:03 +0000 (18:17 +0000)]
Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 17:36:53 +0000 (17:36 +0000)]
am
8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
* commit '
8ff73b596e7c59f32a3f0df503ae8a9e5adbced5':
Cherry-pick: Add callback-based support for HW Activity Recognition.
Daniel Estrada Alva [Wed, 26 Aug 2015 17:30:09 +0000 (17:30 +0000)]
Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 17:26:59 +0000 (17:26 +0000)]
am
a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
* commit '
a07177f0ad362ab3e03029cf774e55579ea025cf':
Launching the camera now from systemUI including animations
Selim Cinek [Wed, 26 Aug 2015 17:20:50 +0000 (17:20 +0000)]
Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 02:03:48 +0000 (19:03 -0700)]
Migrate camera vibration to the systemUI
Also make sure the device is awake before vibrating.
Bug:
23200352
Change-Id: I63d04a82a4b8d9fa3e8f9deff5dd71295c82c930
OSDN Git Service
