OSDN Git Service

android-x86/frameworks-base.git
8 years agoam baff0776: am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup...
Deepanshu Gupta [Thu, 27 Aug 2015 01:57:28 +0000 (01:57 +0000)]
am baff0776: am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit 'baff0776bd4d490d6a02f1e3ae3cc5a761ce386e':
  Run setup for full tests only once. [DO NOT MERGE]

8 years agoam e77d052b: am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib...
Deepanshu Gupta [Thu, 27 Aug 2015 01:57:22 +0000 (01:57 +0000)]
am e77d052b: am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'e77d052b2582c778056093d782f6e83fa12c5923':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

8 years agoam be6438aa: am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib...
Deepanshu Gupta [Thu, 27 Aug 2015 01:57:16 +0000 (01:57 +0000)]
am be6438aa: am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit 'be6438aaf400c3e8bf76e94199de291fc7b345bf':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

8 years agoam 14383771: am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set suppor...
Deepanshu Gupta [Thu, 27 Aug 2015 01:57:10 +0000 (01:57 +0000)]
am 14383771: am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit '143837717d784bae20f23c3663f0f1cf06d3f75f':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

8 years agoam 0155fb64: am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib...
Deepanshu Gupta [Thu, 27 Aug 2015 01:57:04 +0000 (01:57 +0000)]
am 0155fb64: am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit '0155fb645472805bf1a9937279a8a32a139ce8f0':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]

8 years agoam a5e87b01: am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:57 +0000 (01:56 +0000)]
am a5e87b01: am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit 'a5e87b01ff55311ab042f5dcaea395748b8deae6':
  Update nav bar icons. [DO NOT MERGE]

8 years agoam befeb767: am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:51 +0000 (01:56 +0000)]
am befeb767: am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit 'befeb76711deebab503b0e7cc0d1cb7b6f6ef3d9':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

8 years agoam 1f178854: am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarVi...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:45 +0000 (01:56 +0000)]
am 1f178854: am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit '1f178854af5be5354dfc8b30bee26ee2505ea239':
  CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

8 years agoam a097124d: am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:38 +0000 (01:56 +0000)]
am a097124d: am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit 'a097124d65dc0e6142377d738e1d764043182b08':
  Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

8 years agoam 5e570d37: am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:31 +0000 (01:56 +0000)]
am 5e570d37: am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit '5e570d37dfc136b60b2ad185a2c9660d2166540b':
  Change tools:list_item to listitem. [DO NOT MERGE]

8 years agoam 44063c65: am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:25 +0000 (01:56 +0000)]
am 44063c65: am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit '44063c65f688c831d43a807f6e3ff3687d1f62e8':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]

8 years agoam 8d0ec8a2: am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support...
Jens Ole Lauridsen [Thu, 27 Aug 2015 01:56:19 +0000 (01:56 +0000)]
am 8d0ec8a2: am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit '8d0ec8a24a312d8e22293e400cbd5525ee45ad6b':
  Support AppBar from Material Design. [DO NOT MERGE]

8 years agoam 8ffa52af: am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:13 +0000 (01:56 +0000)]
am 8ffa52af: am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit '8ffa52aff717c51a9259e40fe2632b04f54b1f14':
  Update tests per new layoutlib_api [DO NOT MERGE]

8 years agoam 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missin...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:00 +0000 (01:56 +0000)]
am 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '4de90cf0a96ef215e1b6179a5bc8bff18266ce77':
  Add missing resolveResValue call. [DO NOT MERGE]

8 years agoam 15dd3802: am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib...
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]

8 years agoam 74f88968: am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warni...
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]

8 years agoam 1d1fae81: am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import...
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]

8 years agoam a62ad156: am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix Parser...
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]

8 years agoam 26bdd0c8: am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE...
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]

8 years agoam ec160c67: am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix Bridge...
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]

8 years agoam 0b95542d: am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include...
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]

8 years agoam c0a9faad: am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib...
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]

8 years agoam f3696835: am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib...
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]

8 years agoam b602943f: am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add docume...
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]

8 years agoam 0f0cae1a: am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DateP...
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]

8 years agoam 14be8ed3: am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject...
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]

8 years agoam 2c1cc061: am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update...
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]

8 years agoam 4b030f0b: am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Conte...
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]

8 years agoam bf2c3b67: am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix includ...
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]

8 years agoam 8053ef0c: am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show bette...
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]

8 years agoam 48aea8cc: am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build...
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]

8 years agoam ac5f66e3: am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t...
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]

8 years agoam 8affffc7: am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove...
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]

8 years agoam 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:46 +0000 (01:44 +0000)]
am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit '4ed5de8861ab085f253086141de7c96f54acf41a':
  Run setup for full tests only once. [DO NOT MERGE]

8 years agoam dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:42 +0000 (01:44 +0000)]
am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'dd7d7aacfea68dfd20a7b6d4be67777a7cfe2993':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

8 years agoam 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:37 +0000 (01:44 +0000)]
am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '28677599a9adc1e41f4e48623fbbe7839a43223a':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

8 years agoam fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:33 +0000 (01:44 +0000)]
am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit 'fe0e87094c1df6ee3ec5a1bf420c74b134bd673d':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

8 years agoam b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:28 +0000 (01:44 +0000)]
am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit 'b342aba021104d167608349e69e1398b65cf57de':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]

8 years agoam 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:24 +0000 (01:44 +0000)]
am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '23a7bc9cc65952c6127ccbbdce6c80fc4c04e89a':
  Update nav bar icons. [DO NOT MERGE]

8 years agoam 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:20 +0000 (01:44 +0000)]
am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '884cc4754b4062d7263000006b58bade82d09985':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

8 years agoam d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:15 +0000 (01:44 +0000)]
am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit 'd7e001e640d5255525138631dd8b62fda8d63da0':
  CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

8 years agoam 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:10 +0000 (01:44 +0000)]
am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit '19229a8e1f929393b0bbd2cdd1f27bfe15865411':
  Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

8 years agoam c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:02 +0000 (01:44 +0000)]
am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit 'c1b987f0b574b25ecea115562122faf5c74b142e':
  Change tools:list_item to listitem. [DO NOT MERGE]

8 years agoam af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_it...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:52 +0000 (01:43 +0000)]
am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit 'af51c69052e4a7e4c8a10358812976bb188f050c':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]

8 years agoam 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from...
Jens Ole Lauridsen [Thu, 27 Aug 2015 01:43:47 +0000 (01:43 +0000)]
am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit '7f795d16e1207eced6fbb48e889da49105a0b8b5':
  Support AppBar from Material Design. [DO NOT MERGE]

8 years agoam 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:43 +0000 (01:43 +0000)]
am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit '1df73c5bef6dd20e1b3a0dd79f9e56a4a1609e6d':
  Update tests per new layoutlib_api [DO NOT MERGE]

8 years agoam 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResV...
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:39 +0000 (01:43 +0000)]
am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit '409601913682269d6682259ceaa706a29cec56c4':
  Add missing resolveResValue call. [DO NOT MERGE]

8 years agoam b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes...
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]

8 years agoam 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some...
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]

8 years agoam 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. ...
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]

8 years agoam 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not...
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]

8 years agoam e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContex...
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]

8 years agoam 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray...
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]

8 years agoam 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in Layou...
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]

8 years agoam dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support...
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]

8 years agoam 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nulli...
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]

8 years agoam 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about...
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]

8 years agoam fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker renderi...
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]

8 years agoam e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner...
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]

8 years agoam 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir...
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]

8 years agoam 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLo...
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]

8 years agoam ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag renderi...
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]

8 years agoam a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error messa...
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]

8 years agoam df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parse...
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]

8 years agoam bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCa...
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]

8 years agoam ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency...
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]

8 years agoam 487cdebd: am 8f1ea834: Handle the -a flag for dumpsys appops.
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.

8 years agoam 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:06 +0000 (01:32 +0000)]
am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE]

* commit '39b4f4cc75e3e4e2a306102a76d4f9f2b9a1e2e6':
  Run setup for full tests only once. [DO NOT MERGE]

8 years agoam de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar...
Deepanshu Gupta [Thu, 27 Aug 2015 01:32:00 +0000 (01:32 +0000)]
am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'de8da2793df3b3cb05215fa5dd02542548a54b9f':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

8 years agoam 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:53 +0000 (01:31 +0000)]
am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

* commit '963cac18adefa1e60a827183b95b4e61a23929d3':
  LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

8 years agoam 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:48 +0000 (01:31 +0000)]
am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit '76111ecbbde11e0cdddbb76530cf865f8846603e':
  Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

8 years agoam c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:40 +0000 (01:31 +0000)]
am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE]

* commit 'c5bd6146f73a24008414d5bb8c07550e2c7f66ed':
  LayoutLib: translucent sys ui bars [DO NOT MERGE]

8 years agoam 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:34 +0000 (01:31 +0000)]
am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]

* commit '6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1':
  Update nav bar icons. [DO NOT MERGE]

8 years agoam 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSe...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

* commit '5eaa09ff9e4cbf71fd8ca312029987c0c3d43f9e':
  Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

8 years agoam 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.stylea...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:20 +0000 (01:31 +0000)]
am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

* commit '1f2c15ca8e976f3378c9e4cf63b55de3484bb2cc':
  CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

8 years agoam 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a Drawe...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:12 +0000 (01:31 +0000)]
am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

* commit '36e164e095ab4a7f6d8a631a6c209f2e6ced41cb':
  Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

8 years agoam 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem...
Deepanshu Gupta [Thu, 27 Aug 2015 01:31:03 +0000 (01:31 +0000)]
am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE]

* commit '13cd7660813d52f5538a088612c3098d13484b12':
  Change tools:list_item to listitem. [DO NOT MERGE]

8 years agoam a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for Recycl...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:54 +0000 (01:30 +0000)]
am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE]

* commit 'a556d7566b09e4743f859f3ca0878f2084448cfc':
  Implement tools:list_item for RecyclerView. [DO NOT MERGE]

8 years agoam 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design...
Jens Ole Lauridsen [Thu, 27 Aug 2015 01:30:43 +0000 (01:30 +0000)]
am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]

* commit '413d41aac4d573ad4f0270c0fefd94ef4e864225':
  Support AppBar from Material Design. [DO NOT MERGE]

8 years agoam 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:35 +0000 (01:30 +0000)]
am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit '7a92c26e20734df4f48ae74def6689691ef2ce29':
  Update tests per new layoutlib_api [DO NOT MERGE]

8 years agoam c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call...
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:27 +0000 (01:30 +0000)]
am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit 'c5c2ea04780ddf77c37618f7ed37d575a5cd0744':
  Add missing resolveResValue call. [DO NOT MERGE]

8 years agoam e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java...
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]

8 years agoam 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved...
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]

8 years agoam 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [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]

8 years agoam 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized...
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]

8 years agoam bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyle...
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]

8 years agoam f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() ...
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]

8 years agoam 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO...
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]

8 years agoam 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource...
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]

8 years agoam bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotation...
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]

8 years agoam 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in...
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]

8 years agoam 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail...
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]

8 years agoam d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of...
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]

8 years agoam 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests...
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]

8 years agoam aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work...
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]

8 years agoam 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT...
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]

8 years agoam 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color...
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]

8 years agoam 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory...
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]

8 years agoam b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback refere...
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]

8 years agoam 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [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]