Deepanshu Gupta
|
65f8923a25
|
am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]
* commit '8cafc782d8763b0bc9044c21595026707828596b':
Fix import order. [DO NOT MERGE]
|
2015-08-27 01:45:00 +00:00 |
|
Deepanshu Gupta
|
c8e51c1e10
|
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]
|
2015-08-27 01:44:53 +00:00 |
|
Deepanshu Gupta
|
1e4fbdf315
|
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]
|
2015-08-27 01:44:45 +00:00 |
|
Deepanshu Gupta
|
b19e84277e
|
am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '42872f7342f49a58ecee62d547e8a074b9321871':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
|
2015-08-27 01:44:37 +00:00 |
|
Deepanshu Gupta
|
4db2aa3f46
|
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]
|
2015-08-27 01:44:30 +00:00 |
|
Deepanshu Gupta
|
162a799773
|
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]
|
2015-08-27 01:44:23 +00:00 |
|
Deepanshu Gupta
|
5ae9de3a24
|
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]
|
2015-08-27 01:44:15 +00:00 |
|
Deepanshu Gupta
|
330d6104b7
|
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]
|
2015-08-27 01:44:04 +00:00 |
|
Deepanshu Gupta
|
594f76d25b
|
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]
|
2015-08-27 01:43:57 +00:00 |
|
Deepanshu Gupta
|
14b65389a2
|
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]
|
2015-08-27 01:43:48 +00:00 |
|
Deepanshu Gupta
|
4efc48170e
|
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]
|
2015-08-27 01:43:42 +00:00 |
|
Deepanshu Gupta
|
268a461654
|
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]
|
2015-08-27 01:43:35 +00:00 |
|
Deepanshu Gupta
|
a012a91b9d
|
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]
|
2015-08-27 01:43:28 +00:00 |
|
Deepanshu Gupta
|
54dd25f09d
|
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]
|
2015-08-27 01:43:21 +00:00 |
|
Deepanshu Gupta
|
4c276bb904
|
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]
|
2015-08-27 01:43:15 +00:00 |
|
Deepanshu Gupta
|
4509e3d2e7
|
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]
|
2015-08-27 01:43:03 +00:00 |
|
Deepanshu Gupta
|
7781467d48
|
am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit 'ef284578ee3b77890bcb45bbd1f89a5d244bced1':
Remove kxml dependency [DO NOT MERGE]
|
2015-08-27 01:42:56 +00:00 |
|
Deepanshu Gupta
|
8cafc782d8
|
am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]
* commit '13670bc6dea025bfd9b35c604547fe2b0bd2047a':
Fix import order. [DO NOT MERGE]
|
2015-08-27 01:30:02 +00:00 |
|
Deepanshu Gupta
|
57185503a1
|
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]
|
2015-08-27 01:29:50 +00:00 |
|
Deepanshu Gupta
|
e779dec0ab
|
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]
|
2015-08-27 01:29:43 +00:00 |
|
Deepanshu Gupta
|
42872f7342
|
am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit 'f2bf5470a3ec1f5eb8584e0d7c1a8eb3c08d8d20':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
|
2015-08-27 01:29:36 +00:00 |
|
Deepanshu Gupta
|
35f6976e10
|
am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '7ec7805a50893be6242a41de01299cb1de44b461':
Include Shapes in LayoutLib. [DO NOT MERGE]
|
2015-08-27 01:29:30 +00:00 |
|
Deepanshu Gupta
|
dc78e1080e
|
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]
|
2015-08-27 01:29:19 +00:00 |
|
Deepanshu Gupta
|
0ae857751c
|
am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit 'bd343c1fbf05087094e1dbf40048137e3a3e08fa':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
|
2015-08-27 01:29:10 +00:00 |
|
Deepanshu Gupta
|
7d7f0f4731
|
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]
|
2015-08-27 01:29:05 +00:00 |
|
Deepanshu Gupta
|
fcc6212778
|
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]
|
2015-08-27 01:28:58 +00:00 |
|
Deepanshu Gupta
|
e3040e9a73
|
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]
|
2015-08-27 01:28:48 +00:00 |
|
Deepanshu Gupta
|
56c72f4c50
|
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]
|
2015-08-27 01:28:42 +00:00 |
|
Deepanshu Gupta
|
720d677fc2
|
am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit 'aae9c9309ca5155124f740b10a40c68b09ed0ce6':
Make Context.getClassLoader() work. [DO NOT MERGE]
|
2015-08-27 01:28:35 +00:00 |
|
Deepanshu Gupta
|
ef31930253
|
am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '522e67e4ac600fb19c18f55f0e51096af9ae37d3':
Fix include tag rendering. [DO NOT MERGE]
|
2015-08-27 01:28:21 +00:00 |
|
Deepanshu Gupta
|
a6d71a2c37
|
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]
|
2015-08-27 01:28:14 +00:00 |
|
Deepanshu Gupta
|
df44516b78
|
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]
|
2015-08-27 01:28:07 +00:00 |
|
Deepanshu Gupta
|
bf01932797
|
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]
|
2015-08-27 01:27:52 +00:00 |
|
Deepanshu Gupta
|
ef284578ee
|
am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '78d77bc379f42dfe020cf0719ceae14174cf1c33':
Remove kxml dependency [DO NOT MERGE]
|
2015-08-27 01:27:45 +00:00 |
|
Tim Kilbourn
|
dbcad63b43
|
am 8f1ea834: Handle the -a flag for dumpsys appops.
* commit '8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8':
Handle the -a flag for dumpsys appops.
|
2015-08-27 01:15:40 +00:00 |
|
Tim Kilbourn
|
8f1ea834f9
|
Handle the -a flag for dumpsys appops.
Bug: 23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
|
2015-08-26 15:07:37 -07:00 |
|
Alan Viverette
|
3b83e5bf7b
|
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
|
2015-08-26 20:45:42 +00:00 |
|
Alan Viverette
|
9513785715
|
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
|
2015-08-26 20:38:53 +00:00 |
|
Deepanshu Gupta
|
13670bc6de
|
am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]
* commit '669e4969a7245cf9d1febc5d4e67a0f2063e87fb':
Fix import order. [DO NOT MERGE]
|
2015-08-26 20:19:52 +00:00 |
|
Deepanshu Gupta
|
6dc8bab993
|
am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit 'c0fd131642f21eabec570147cf9f4116c900e8a0':
Fix ParserFactory not initialized error. [DO NOT MERGE]
|
2015-08-26 20:19:39 +00:00 |
|
Deepanshu Gupta
|
bf7907bfc8
|
am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '6b836cd06b1a2ebe5d31336486bb1b54e42439df':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
|
2015-08-26 20:19:32 +00:00 |
|
Deepanshu Gupta
|
f2bf5470a3
|
am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '91e456d235256c385a7da1e45f098386bc68e86a':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
|
2015-08-26 20:19:23 +00:00 |
|
Deepanshu Gupta
|
7ec7805a50
|
am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
Include Shapes in LayoutLib. [DO NOT MERGE]
|
2015-08-26 20:19:13 +00:00 |
|
Deepanshu Gupta
|
594939fc07
|
am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '66d5f24df0c3627028812ee23da8d4f08cc83e5c':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
|
2015-08-26 20:19:05 +00:00 |
|
Deepanshu Gupta
|
bd343c1fbf
|
am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit 'b32e44ff0c5fd410720bb28c87bc9cea83556edf':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
|
2015-08-26 20:18:54 +00:00 |
|
Deepanshu Gupta
|
9b1ac26921
|
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]
|
2015-08-26 20:18:47 +00:00 |
|
Deepanshu Gupta
|
6b7f9ae6f5
|
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]
|
2015-08-26 20:18:34 +00:00 |
|
Deepanshu Gupta
|
d6363d8606
|
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]
|
2015-08-26 20:18:27 +00:00 |
|
Deepanshu Gupta
|
5b886bb08f
|
am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
Update platformDir search in tests. [DO NOT MERGE]
|
2015-08-26 20:18:15 +00:00 |
|
Deepanshu Gupta
|
aae9c9309c
|
am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '2f50403fe0a8a035757b047af00c7520fadb9015':
Make Context.getClassLoader() work. [DO NOT MERGE]
|
2015-08-26 20:18:09 +00:00 |
|