Commit Graph

14153 Commits

Author SHA1 Message Date
Adam Powell
d564644849 am 0305f641: am e40272d7: Merge "Update sample for RecyclerView" into klp-modular-dev
* commit '0305f64106e9aad29fe486e4960d1fe5b90c56bf':
  Update sample for RecyclerView
2014-01-22 13:41:50 -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
c361cb326f am 4d5e9058: am 5ac8842b: 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 '4d5e9058acc843b43eacf3c68dc4dfa43a08ff16':
  docs: Code sample for game controller training class.
2014-01-22 19:55:47 +00:00
quddusc
4d5e9058ac am 5ac8842b: 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 '5ac8842bde44b82c63a764cf75b06727a20b5d05':
  docs: Code sample for game controller training class.
2014-01-22 11:53:58 -08: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
987864e8b9 am 5e6b8b3c: am 3d0ef858: Merge "Handle IOException from MediaCodec factory methods"
* commit '5e6b8b3c1d5d3a00dffc19829b0f5f78aa31b97b':
  Handle IOException from MediaCodec factory methods
2014-01-21 23:13:01 +00:00
Andy Hung
5e6b8b3c1d am 3d0ef858: Merge "Handle IOException from MediaCodec factory methods"
* commit '3d0ef8581abe522c747ea891ae797eeaffc84aa4':
  Handle IOException from MediaCodec factory methods
2014-01-21 15:10:02 -08:00
Andy Hung
3d0ef8581a Merge "Handle IOException from MediaCodec factory methods" 2014-01-21 23:06:38 +00:00
Scott Main
ad77e1c353 am 54c0620e: am 3f8cdfdf: am e3f73112: am 6bada134: am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
* commit '54c0620e3d29bd15cb10c9a8466dff688540b4af':
  remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:31:58 +00:00
Scott Main
54c0620e3d am 3f8cdfdf: am e3f73112: am 6bada134: am 9d1bdcb5: am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
* commit '3f8cdfdf37dae08f01c60c92fc3503c2a08be4cd':
  remove redirect for guide/index.html now that we actually have such a page
2014-01-17 18:30:26 -08: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
bd983a1509 am 375047c5: am 1c85b25a: am 802b3257: am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
* commit '375047c56ccb3d489094d1f1e3fd6f6f9021ade9':
  Update DrawerLayout demo code to use title API
2014-01-17 22:47:05 +00:00
Alan Viverette
375047c56c am 1c85b25a: am 802b3257: am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
* commit '1c85b25ab17a63da474aee89f39949ee9e03b8a4':
  Update DrawerLayout demo code to use title API
2014-01-17 14:45:40 -08: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
b4db807bdb am 40ac3d01: am 928962b7: am 057e870f: am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
* commit '40ac3d01bb31315206b3cede4aeb5fee4f12ef6f':
  Revert "Update DrawerLayout demo code to use title API"
2014-01-17 06:04:38 +00:00
Alan Viverette
40ac3d01bb am 928962b7: am 057e870f: am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
* commit '928962b775cb637e270763c25982d328d0e9545b':
  Revert "Update DrawerLayout demo code to use title API"
2014-01-16 22:02:32 -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
99159fbf4a am 1c08deef: am 3c44c2a2: am 69335b8f: am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
* commit '1c08deefa65cfbc248540f89b1ed07d02fb81691':
  Update DrawerLayout demo code to use title API
2014-01-17 01:14:21 +00:00
Alan Viverette
1c08deefa6 am 3c44c2a2: am 69335b8f: am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
* commit '3c44c2a2b461caff314ab5a6e55314d8801b5178':
  Update DrawerLayout demo code to use title API
2014-01-16 17:11:36 -08: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
5a28b08b85 am 9beb5da3: am a131dee4: am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
* commit '9beb5da33a889ae1cdab553a487c72b0f5cc0e5f':
  Fix headers to be inclued alone
2014-01-16 17:23:00 +00:00
Andrew Hsieh
ec01bd3bfb am 400ac261: am be13dbd7: am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
* commit '400ac2616ecb15cf8961a68d733bb20284b4166e':
  Fix typo in comments in looper.h
2014-01-16 17:22:59 +00:00
Andrew Hsieh
a2ef514b62 am 83bd985e: am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit '83bd985ec66d25e4d11abc60f02f00c4ecc2c7c4':
  Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:22:58 +00:00
Andrew Hsieh
9beb5da33a am a131dee4: am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
* commit 'a131dee4976d32ab79b8bdb92cae2d790a119990':
  Fix headers to be inclued alone
2014-01-16 09:20:27 -08:00
Andrew Hsieh
400ac2616e am be13dbd7: am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
* commit 'be13dbd7b8a4fa3b98cdc1f87ab04082feef064b':
  Fix typo in comments in looper.h
2014-01-16 09:20:26 -08:00
Andrew Hsieh
83bd985ec6 am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit '470ec2be44ad2bed606ec9cdd7dcbdfc56de1b89':
  Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:20:25 -08:00