OSDN Git Service

android-x86/frameworks-base.git
8 years agoam ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
Ashish Sharma [Thu, 27 Aug 2015 23:34:04 +0000 (23:34 +0000)]
am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev

* commit 'ffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8':
  BatteryStats: Bump checkin version

8 years agoam 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
Ashish Sharma [Thu, 27 Aug 2015 23:28:22 +0000 (23:28 +0000)]
am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev

* commit '3883e72aeda7dcc5f76eba7ad2e95ad2cb041687':
  BatteryStats: Bump checkin version

8 years agoMerge "BatteryStats: Bump checkin version" into mnc-dev
Ashish Sharma [Thu, 27 Aug 2015 23:21:16 +0000 (23:21 +0000)]
Merge "BatteryStats: Bump checkin version" into mnc-dev

8 years agoam c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into...
Ajay Panicker [Thu, 27 Aug 2015 19:40:05 +0000 (19:40 +0000)]
am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

* commit 'c07701f2764a1c09dc3e8af4321ff0ef66056fee':
  Add StateMachine.removeDeferredMessages()

8 years agoam 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
Ajay Panicker [Thu, 27 Aug 2015 19:33:31 +0000 (19:33 +0000)]
am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

* commit '3e5b01185c08c46b80c395ca1f9c93e45cd98ba5':
  Add StateMachine.removeDeferredMessages()

8 years agoMerge "Add StateMachine.removeDeferredMessages()" into mnc-dev
Ajay Panicker [Thu, 27 Aug 2015 19:21:39 +0000 (19:21 +0000)]
Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev

8 years agoam aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()
Eric Laurent [Thu, 27 Aug 2015 18:33:41 +0000 (18:33 +0000)]
am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit 'aef51d09ef33eb3f03789c71edc25a7b103728d1':
  AudioTrack: error reporting for getTimestamp()

8 years agoam 4a8034ca: AudioTrack: error reporting for getTimestamp()
Eric Laurent [Thu, 27 Aug 2015 18:28:48 +0000 (18:28 +0000)]
am 4a8034ca: AudioTrack: error reporting for getTimestamp()

* commit '4a8034caea13a90c01800ff554539772c6ff5523':
  AudioTrack: error reporting for getTimestamp()

8 years agoam 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
Adrian Roos [Thu, 27 Aug 2015 18:15:21 +0000 (18:15 +0000)]
am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

* commit '16d7245b64062f4c65d55433642388d1dc9bdf70':
  Prevent Fingerprint when SIM is locked

8 years agoMerge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
Adrian Roos [Thu, 27 Aug 2015 18:06:44 +0000 (18:06 +0000)]
Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

8 years agoAudioTrack: error reporting for getTimestamp()
Eric Laurent [Thu, 2 Jul 2015 19:09:44 +0000 (12:09 -0700)]
AudioTrack: error reporting for getTimestamp()

Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)

8 years agoam fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev
Zhentao Sun [Thu, 27 Aug 2015 03:31:19 +0000 (03:31 +0000)]
am fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev

* commit 'fd538001f5c7f1fad68a27d8143c839bda82491b':
  Added event log for camera launch gesture.

8 years agoMerge "Added event log for camera launch gesture." into mnc-dr-dev
Zhentao Sun [Thu, 27 Aug 2015 03:23:46 +0000 (03:23 +0000)]
Merge "Added event log for camera launch gesture." into mnc-dr-dev

8 years agoam dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev
Jim Miller [Thu, 27 Aug 2015 02:52:16 +0000 (02:52 +0000)]
am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev

* commit 'dfb8cca04dd64dcdf1df4550f7e808360de0517d':
  Don't check the keyguard PIN a second time

8 years agoMerge "Don't check the keyguard PIN a second time" into mnc-dr-dev
Jim Miller [Thu, 27 Aug 2015 02:44:18 +0000 (02:44 +0000)]
Merge "Don't check the keyguard PIN a second time" into mnc-dr-dev

8 years agoAdd StateMachine.removeDeferredMessages()
Ajay Panicker [Wed, 26 Aug 2015 21:06:34 +0000 (14:06 -0700)]
Add StateMachine.removeDeferredMessages()

Bug: 23111466
Change-Id: Ifbb67d4eb080313af0968d5cb6b9508837e3458e

8 years agoam 9dbc35d1: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit...
Rich Slogar [Thu, 27 Aug 2015 01:56:33 +0000 (01:56 +0000)]
am 9dbc35d1: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '9dbc35d10be3ac3a446e00c39d6604024e228f10':
  docs: New auto Desktop Head Unit (DHU) docs

8 years agoam 442c48b9: am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:28 +0000 (01:56 +0000)]
am 442c48b9: am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit '442c48b98ca8ef914fbdea3697239f6da88d551b':
  LayoutLib: Update golden test images. [DO NOT MERGE]

8 years agoam e81c3b45: am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:23 +0000 (01:56 +0000)]
am e81c3b45: am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit 'e81c3b45ca4acd19c16465a2923481f0e4a5ce0e':
  An ugly hack to render CalendarView. [DO NOT MERGE]

8 years agoam 52bd715d: am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:18 +0000 (01:56 +0000)]
am 52bd715d: am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit '52bd715d5dea5587ff3fc397ad32f561c855dd14':
  LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

8 years agoam 14d291e8: am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getIn...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:15 +0000 (01:56 +0000)]
am 14d291e8: am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit '14d291e86672ee4c1d28c18fb4503a7ae562a1e0':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

8 years agoam 1ddcfe84: am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:11 +0000 (01:56 +0000)]
am 1ddcfe84: am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit '1ddcfe844208051d96827aaf9a2e4f4045260312':
  Fix layout mirroring. [DO NOT MERGE]

8 years agoam 7b552da2: am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo...
Deepanshu Gupta [Thu, 27 Aug 2015 01:56:07 +0000 (01:56 +0000)]
am 7b552da2: am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '7b552da2d1d6e9fb1583d3dfe66f39fe84c41c4d':
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

8 years agoam 6fb99762: am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix...
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:57 +0000 (01:55 +0000)]
am 6fb99762: am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit '6fb997626a8babd3eebb821df887654e691b93d8':
  Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

8 years agoam 66c51bef: am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert...
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:50 +0000 (01:55 +0000)]
am 66c51bef: am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit '66c51bef2f1ec2d98e3e15200a9bca382529fa4f':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

8 years agoam f0d24b65: am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix import...
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:46 +0000 (01:55 +0000)]
am f0d24b65: am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit 'f0d24b6561425fe06dde2ee8834580fb068aa1fe':
  Fix imports. [DO NOT MERGE]

8 years agoam 84544de7: am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme...
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:42 +0000 (01:55 +0000)]
am 84544de7: am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '84544de7fefa9b5052ea0418a6e238f459c5dbb2':
  Fix theme namespace in tests. [DO NOT MERGE]

8 years agoam baff0776: am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup...
Deepanshu Gupta [Thu, 27 Aug 2015 01:55:38 +0000 (01:55 +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:55:34 +0000 (01:55 +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:55:30 +0000 (01:55 +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:55:26 +0000 (01:55 +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:55:22 +0000 (01:55 +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:55:18 +0000 (01:55 +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:55:14 +0000 (01:55 +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:55:10 +0000 (01:55 +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:55:05 +0000 (01:55 +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:55:00 +0000 (01:55 +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:54:56 +0000 (01:54 +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:54:51 +0000 (01:54 +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:54:47 +0000 (01:54 +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:54:43 +0000 (01:54 +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:54:38 +0000 (01:54 +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:54:34 +0000 (01:54 +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:54:30 +0000 (01:54 +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:54:26 +0000 (01:54 +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:54:22 +0000 (01:54 +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:54:18 +0000 (01:54 +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:54:14 +0000 (01:54 +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:54:10 +0000 (01:54 +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:54:07 +0000 (01:54 +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:03 +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:53:58 +0000 (01:53 +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:53:54 +0000 (01:53 +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:53:51 +0000 (01:53 +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:53:47 +0000 (01:53 +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:53:43 +0000 (01:53 +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:53:37 +0000 (01:53 +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:53:32 +0000 (01:53 +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:53:26 +0000 (01:53 +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:21 +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 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs
Rich Slogar [Thu, 27 Aug 2015 01:45:36 +0000 (01:45 +0000)]
am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs

* commit '258b56ec58fca2b740bcfe9a2af81f0f59a14abb':
  docs: New auto Desktop Head Unit (DHU) docs

8 years agoam a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golde...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:32 +0000 (01:45 +0000)]
am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]

* commit 'a4a1e68fe76134a940e02f3d425b3429791177e5':
  LayoutLib: Update golden test images. [DO NOT MERGE]

8 years agoam c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:28 +0000 (01:45 +0000)]
am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit 'c2e98ca39a67bd24e305826c51a0ba85f7b59ef4':
  An ugly hack to render CalendarView. [DO NOT MERGE]

8 years agoam 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:24 +0000 (01:45 +0000)]
am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

* commit '58967c69b96492fb64a258c0131f0c6791057ed3':
  LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

8 years agoam 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTy...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:20 +0000 (01:45 +0000)]
am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

* commit '5d282e3f3c280642ce7c99c4e72f0ccf7132fc09':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

8 years agoam 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:13 +0000 (01:45 +0000)]
am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit '47530108c22cb8eb50d425cd10be48b4fb3005b0':
  Fix layout mirroring. [DO NOT MERGE]

8 years agoam 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:09 +0000 (01:45 +0000)]
am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

* commit '4116ed7b0524b42d8d3b0cb01545e1dc3bac6c6c':
  Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

8 years agoam dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:04 +0000 (01:45 +0000)]
am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

* commit 'dfcd35d7929025fdcd2f13a1fe5ec84090f07716':
  Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

8 years agoam a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppThem...
Deepanshu Gupta [Thu, 27 Aug 2015 01:45:00 +0000 (01:45 +0000)]
am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit 'a0bef60c3670e4484b5bfc3fc5cc79b7f9918603':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

8 years agoam af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:56 +0000 (01:44 +0000)]
am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]

* commit 'af3deb06be28a6131d854ae4a109aa49dc8179dc':
  Fix imports. [DO NOT MERGE]

8 years agoam 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace...
Deepanshu Gupta [Thu, 27 Aug 2015 01:44:52 +0000 (01:44 +0000)]
am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]

* commit '554f3a352a0a2091321cf72b4ddf32869c901dcb':
  Fix theme namespace in tests. [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]