Raphael Moll
068a00f850
Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
...
(Merged from AOSP 260db8ce43 )
Change-Id: Id190e9e83c48bf6b3df08707efdbf154720c3a78
2014-01-30 12:27:11 -08:00
Raphael Moll
561423569c
Merge "Update revision of Android SDK USB driver for Windows."
2014-01-30 18:22:23 +00:00
Raphael Moll
8221674986
Update revision of Android SDK USB driver for Windows.
...
Rev 9 adds the Glass PID.
Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
2014-01-30 10:16:57 -08:00
Xavier Ducrohet
55089c32d5
Merge "Android SDK Windows USB driver: Glass PID."
2014-01-29 23:02:54 +00:00
Raphael Moll
260db8ce43
Android SDK Windows USB driver: Glass PID.
...
Change-Id: Id190e9e83c48bf6b3df08707efdbf154720c3a78
2014-01-29 14:57:49 -08:00
Adam Powell
620877f34c
am b9767caa: Updated Support7Demos to follow RecyclerView API changes
...
* commit 'b9767caa951c119945de50ec0a6f1f6113ba44bb':
Updated Support7Demos to follow RecyclerView API changes
2014-01-29 17:55:17 +00:00
Adam Powell
b9767caa95
Updated Support7Demos to follow RecyclerView API changes
...
Move off of deprecated RecyclerView API to illustrate preferred
practices.
Change-Id: I6d2b6450bbb29c55090802b2ccafab6661036dcb
2014-01-28 18:51:11 -08:00
Chet Haase
a6e59a9d7f
Add controls demo with default theme
...
Change-Id: I95cd31cd93e77b17aa2bcacf6e6140aaba719217
2014-01-28 14:13:31 -08:00
Igor Murashkin
b35848625b
Merge changes Ia8070804,I3033b442,I5e9fcebe
...
* changes:
runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
runtest: add --build-install-only/-i flag to skip test execution
runtest: Update to work with emulator and to build dependencies
2014-01-25 00:32:08 +00:00
Igor Murashkin
f9cfbd39ae
runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
...
Change-Id: Ia8070804110e8064f79a8063ed6aefc92d71bf7a
2014-01-24 16:03:11 -08:00
Igor Murashkin
8d703533ba
runtest: add --build-install-only/-i flag to skip test execution
...
Change-Id: I3033b442e33a69442b881f0a5a7b9e2299d35d54
2014-01-24 16:03:11 -08:00
Igor Murashkin
a0afc8cfb2
runtest: Update to work with emulator and to build dependencies
...
* Combine dalvik.vm.dexopt-flags with existing to disable verification
* Always do a runtime reset (stop;start) instead of rebooting device
* Build dependencies (mma) if regular build fails (mm)
Change-Id: I5e9fcebeea052c3314d1f4146b074637c329c0a0
2014-01-24 16:03:06 -08:00
Adam Powell
09b5d826dd
am 35421b12: Follow RecyclerView API changes
...
* commit '35421b12299f9569f82c228631c4156fbb3f0b94':
Follow RecyclerView API changes
2014-01-24 00:21:04 +00:00
Adam Powell
35421b1229
Follow RecyclerView API changes
...
Change-Id: Ic273cc51cc9d7096a7a0d8b5f90accd5986e275a
2014-01-23 16:11:09 -08:00
Adam Powell
0305f64106
am e40272d7: Merge "Update sample for RecyclerView" into klp-modular-dev
...
* commit 'e40272d7dc15e198d63f2000ce929016cfff17b9':
Update sample for RecyclerView
2014-01-22 21:39:38 +00:00
Adam Powell
e40272d7dc
Merge "Update sample for RecyclerView" into klp-modular-dev
2014-01-22 21:36:40 +00:00
quddusc
5ac8842bde
am c9dca45a: am c9217022: am 911c8806: am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'c9dca45a4f6c06743d9118185114e9bbeaa49efb':
docs: Code sample for game controller training class.
2014-01-22 19:52:35 +00:00
quddusc
c9dca45a4f
am c9217022: am 911c8806: am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'c9217022a6fb254f459a6ab14c900ac7ef2d03f1':
docs: Code sample for game controller training class.
2014-01-22 19:50:21 +00:00
quddusc
c9217022a6
am 911c8806: am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit '911c88060a120167e16d14d273e7fafd3c242c1b':
docs: Code sample for game controller training class.
2014-01-22 11:43:45 -08:00
quddusc
911c88060a
am eeea76c2: am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'eeea76c257be2f5ab60fdc6126ce6d5749d0ce01':
docs: Code sample for game controller training class.
2014-01-22 11:42:03 -08:00
quddusc
eeea76c257
am 176d0c68: am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit '176d0c68d5bc41d2332f355b1c5a1324a9b926d8':
docs: Code sample for game controller training class.
2014-01-22 11:40:04 -08:00
quddusc
176d0c68d5
am a6dfbaf0: am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'a6dfbaf03710ff5c1099196d3907ddb31d85806f':
docs: Code sample for game controller training class.
2014-01-22 11:37:25 -08:00
quddusc
a6dfbaf037
am ca789a98: Merge "docs: Code sample for game controller training class." into jb-mr2-docs
...
* commit 'ca789a983563ee222b9feb6409cf8ea1917040c3':
docs: Code sample for game controller training class.
2014-01-22 11:33:55 -08:00
Adam Powell
ebea7fc21e
Update sample for RecyclerView
...
Fix some issues around relayout. Add data set changes and cheese.
Change-Id: Ie3651fa16f2eadd0bf1b168b95509172fcf425fe
2014-01-22 10:50:21 -08:00
quddusc
ca789a9835
Merge "docs: Code sample for game controller training class." into jb-mr2-docs
2014-01-22 18:13:16 +00:00
Andy Hung
3d0ef8581a
Merge "Handle IOException from MediaCodec factory methods"
2014-01-21 23:06:38 +00:00
Scott Main
3f8cdfdf37
am e3f73112: am 6bada134: am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit 'e3f73112d0434fbc5e89853b1f1230b40006399b':
remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:28:58 +00:00
Scott Main
e3f73112d0
am 6bada134: am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit '6bada1345201d1c42be2734b98ca631c9adbc3bd':
remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:26:51 +00:00
Scott Main
6bada13452
am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit '9d1bdcb5f15ae5eb1e392ff564d7e55ea20e942b':
remove redirect for guide/index.html now that we actually have such a page
2014-01-17 18:23:15 -08:00
Scott Main
9d1bdcb5f1
am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit '8a37395f3a623cbd7d0c65de911c3d4e8d1002a2':
remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:21:27 +00:00
Alan Viverette
1c85b25ab1
am 802b3257: am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit '802b3257de47f94b2a36da8d9ddd92cd89bade38':
Update DrawerLayout demo code to use title API
2014-01-17 22:41:51 +00:00
Alan Viverette
802b3257de
am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit 'b9dcf8517443abc671c44cf3e629c623b7713bf1':
Update DrawerLayout demo code to use title API
2014-01-17 22:39:48 +00:00
Alan Viverette
b9dcf85174
am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit 'f75b531f71a66daedd846f807a4008806bd37c21':
Update DrawerLayout demo code to use title API
2014-01-17 14:34:31 -08:00
Alan Viverette
f75b531f71
Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
2014-01-17 22:32:41 +00:00
Alan Viverette
13b90285ed
Update DrawerLayout demo code to use title API
...
BUG: 12460402
Change-Id: Id3873bf850f4fac67593c86be9aa2e9e1adb78ba
2014-01-17 10:54:15 -08:00
Alan Viverette
928962b775
am 057e870f: am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit '057e870f5133c2aef4b33dee7d4397ca0845dc62':
Revert "Update DrawerLayout demo code to use title API"
2014-01-17 06:00:26 +00:00
Alan Viverette
057e870f51
am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit 'c2c96e2e6237c83b2e7383a1d9553b8d004f8a33':
Revert "Update DrawerLayout demo code to use title API"
2014-01-17 05:58:13 +00:00
Alan Viverette
c2c96e2e62
am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit 'ae03a0c38df9e669ecc45230830df64a5f30a139':
Revert "Update DrawerLayout demo code to use title API"
2014-01-16 20:28:02 -08:00
Alan Viverette
ae03a0c38d
Revert "Update DrawerLayout demo code to use title API"
...
Dependency isn't upstreaming properly, so reverting until it does.
This reverts commit eddc182fce .
Change-Id: Ic80e0a4b8f8289524828684bbcf836e210182ba9
2014-01-17 04:25:22 +00:00
Alan Viverette
3c44c2a2b4
am 69335b8f: am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit '69335b8fe54e40dfa86447b87ab12983060cd14b':
Update DrawerLayout demo code to use title API
2014-01-17 01:06:43 +00:00
Alan Viverette
69335b8fe5
am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit 'eae40e9945ef7b94c4e36834c0912eaba20fc3e3':
Update DrawerLayout demo code to use title API
2014-01-16 23:47:39 +00:00
Alan Viverette
eae40e9945
am eddc182f: Update DrawerLayout demo code to use title API
...
* commit 'eddc182fce572a688ad38295a6afccdfbf5335e8':
Update DrawerLayout demo code to use title API
2014-01-16 15:42:30 -08:00
Alan Viverette
eddc182fce
Update DrawerLayout demo code to use title API
...
BUG: 12460402
Change-Id: I3c740e571d487ae3edbb3607eaa335e92f3770ce
2014-01-16 14:53:19 -08:00
Andy Hung
17b6a3137e
Handle IOException from MediaCodec factory methods
...
Bug: 1136427
Change-Id: I411a341b551454ee3bd1215e3c6f5572d1555675
Signed-off-by: Andy Hung <hunga@google.com >
2014-01-16 14:02:05 -08:00
Yuhao Zheng
12f62196c5
Add opt/net/wifi/service to eclipse .classpath
...
bug: 12175455
Change-Id: I49df46a1b87822d6cae87b5ed716040e3b6803b7
2014-01-16 10:27:25 -08:00
Andrew Hsieh
a131dee497
am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit '0f69afedc212d49a4141a953302f1a165c1316c8':
Fix headers to be inclued alone
2014-01-16 17:17:30 +00:00
Andrew Hsieh
be13dbd7b8
am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'de53375f23faa38684ca6045067a2e797760f655':
Fix typo in comments in looper.h
2014-01-16 17:17:29 +00:00
Andrew Hsieh
470ec2be44
am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '0423f030642f78d0e107b3c43b75b0ff11fc2e3e':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:17:28 +00:00
Andrew Hsieh
0f69afedc2
am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'b14ac43dbd37c9519b339a99468b1d4a38ec2ce4':
Fix headers to be inclued alone
2014-01-16 17:14:39 +00:00
Andrew Hsieh
de53375f23
am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'f991c5478e8d82e1aa76c1c0a5f813cd5716e171':
Fix typo in comments in looper.h
2014-01-16 17:14:38 +00:00