David Friedman
02e5b0f2ff
Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to.
...
Change-Id: I78cf665fcf9a99aa579eda455ec34987328df445
2015-08-27 17:59:44 -07:00
Ashish Sharma
3883e72aed
Merge "BatteryStats: Bump checkin version" into mnc-dev
2015-08-27 23:21:16 +00:00
Ajay Panicker
3e5b01185c
Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
2015-08-27 19:21:39 +00:00
Eric Laurent
4a8034caea
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)
2015-08-27 17:52:38 +00:00
Ajay Panicker
c211978650
Add StateMachine.removeDeferredMessages()
...
Bug: 23111466
Change-Id: Ifbb67d4eb080313af0968d5cb6b9508837e3458e
2015-08-26 19:34:52 -07:00
Rich Slogar
258b56ec58
am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs
...
* commit '9f37bd8a5d61b2fa05af1b259ec0461673434ec8':
docs: New auto Desktop Head Unit (DHU) docs
2015-08-27 01:37:51 +00:00
Deepanshu Gupta
a4a1e68fe7
am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE]
...
* commit 'ebdedb47e5a24f980e7820c65c60c5bc04c5895d':
LayoutLib: Update golden test images. [DO NOT MERGE]
2015-08-27 01:33:03 +00:00
Deepanshu Gupta
c2e98ca39a
am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]
...
* commit '68ff174b09d9c2bbacf4baa2ba88045df52af4db':
An ugly hack to render CalendarView. [DO NOT MERGE]
2015-08-27 01:32:58 +00:00
Deepanshu Gupta
58967c69b9
am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
...
* commit 'd9600c986dac7e133280ea812dd809532ab90d76':
LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
2015-08-27 01:32:53 +00:00
Deepanshu Gupta
5d282e3f3c
am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
...
* commit '5769732e6e945196bb8bc3e10231d63d6c8686b9':
Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
2015-08-27 01:32:48 +00:00
Deepanshu Gupta
47530108c2
am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]
...
* commit '728fc73130908157770decc593d6e3131e1efd80':
Fix layout mirroring. [DO NOT MERGE]
2015-08-27 01:32:42 +00:00
Deepanshu Gupta
4116ed7b05
am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
...
* commit '37ae8f4ef8921e8810c0a42fc11f3b45a72ffc03':
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
2015-08-27 01:32:35 +00:00
Deepanshu Gupta
dfcd35d792
am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
...
* commit 'e4b4b08446a5f74ba4a5b12c56f1157ab549e72a':
Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]
2015-08-27 01:32:30 +00:00
Deepanshu Gupta
a0bef60c36
am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
...
* commit '05ed2d91484f6185bcca17a71f045be36810e409':
Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
2015-08-27 01:32:24 +00:00
Deepanshu Gupta
af3deb06be
am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE]
...
* commit '21f66a6b9feb449f837f94c65595d67b4b91bf33':
Fix imports. [DO NOT MERGE]
2015-08-27 01:32:18 +00:00
Deepanshu Gupta
554f3a352a
am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE]
...
* commit '34f6f597901b50426b805a62bc0dbf32ef4b6692':
Fix theme namespace in tests. [DO NOT MERGE]
2015-08-27 01:32:12 +00:00
Deepanshu Gupta
4ed5de8861
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]
2015-08-27 01:32:06 +00:00
Deepanshu Gupta
dd7d7aacfe
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]
2015-08-27 01:32:00 +00:00
Deepanshu Gupta
28677599a9
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]
2015-08-27 01:31:53 +00:00
Deepanshu Gupta
fe0e87094c
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]
2015-08-27 01:31:48 +00:00
Deepanshu Gupta
b342aba021
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]
2015-08-27 01:31:40 +00:00
Deepanshu Gupta
23a7bc9cc6
am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE]
...
* commit '6dcfe1e2b42f4c20860a34e47359cb559ae8c8f1':
Update nav bar icons. [DO NOT MERGE]
2015-08-27 01:31:34 +00:00
Deepanshu Gupta
884cc4754b
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]
2015-08-27 01:31:27 +00:00
Deepanshu Gupta
d7e001e640
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]
2015-08-27 01:31:20 +00:00
Deepanshu Gupta
19229a8e1f
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]
2015-08-27 01:31:12 +00:00
Deepanshu Gupta
c1b987f0b5
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]
2015-08-27 01:31:03 +00:00
Deepanshu Gupta
af51c69052
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]
2015-08-27 01:30:54 +00:00
Jens Ole Lauridsen
7f795d16e1
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]
2015-08-27 01:30:43 +00:00
Deepanshu Gupta
1df73c5bef
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]
2015-08-27 01:30:35 +00:00
Deepanshu Gupta
4096019136
am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]
...
* commit 'c5c2ea04780ddf77c37618f7ed37d575a5cd0744':
Add missing resolveResValue call. [DO NOT MERGE]
2015-08-27 01:30:27 +00:00
Deepanshu Gupta
b9d2a52995
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]
2015-08-27 01:30:14 +00:00
Deepanshu Gupta
637eacfdb4
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]
2015-08-27 01:30:08 +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
Rich Slogar
9f37bd8a5d
am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs
...
* commit '0238bf248095682b870732432095a987ee558aa2':
docs: New auto Desktop Head Unit (DHU) docs
2015-08-27 01:19:52 +00:00