Commit Graph

13194 Commits

Author SHA1 Message Date
Scott Main
88147ca639 am a9de2b8e: am 01d72b37: redirect old google intents page to new common intents page
* commit 'a9de2b8e0e04b1333126a0131570c03dc4b09610':
  redirect old google intents page to new common intents page
2014-02-04 19:23:32 +00:00
Scott Main
a9de2b8e0e am 01d72b37: redirect old google intents page to new common intents page
* commit '01d72b37a87ce8781cd35d5aaa834b508f964be7':
  redirect old google intents page to new common intents page
2014-02-04 19:19:24 +00:00
Scott Main
01d72b37a8 redirect old google intents page to new common intents page
Change-Id: Iac645c2f3094fa8d362ac6a2bacdbafdd1e36b08
2014-02-04 19:16:24 +00:00
Scott Main
d9a4680def am 0c2c7587: am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '0c2c7587d0852231a24ccd2a4f2749633b16e068':
  add redirect for removed samples page
2014-02-04 18:55:22 +00:00
Scott Main
0c2c7587d0 am 788cdd43: am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '788cdd4335a0bd6cbe4b6efd0d7abf8139bdd6b5':
  add redirect for removed samples page
2014-02-04 18:54:08 +00:00
Scott Main
788cdd4335 am 6ebae474: am 2e3e1da7: add redirect for removed samples page
* commit '6ebae4742c92daecf18a3a3f1bfbc125c522bd44':
  add redirect for removed samples page
2014-02-04 18:51:39 +00:00
Scott Main
6ebae4742c am 2e3e1da7: add redirect for removed samples page
* commit '2e3e1da7ac58c7e9cdc47541553110864ec931a7':
  add redirect for removed samples page
2014-02-04 18:49:30 +00:00
Scott Main
2e3e1da7ac add redirect for removed samples page
Change-Id: I918d2c501ae9be881d578cda03218db6317cbcb6
2014-02-04 10:46:52 -08:00
Andrew Hsieh
4618dc6c2a Rename arch-aarch64 to arch-arm64
Build instruction:
  ./build/tools/download-toolchain-sources.sh /tmp/ndk-$USER/src
  ./build/tools/gen-platforms.sh --minimal --dst-dir=$NDK \
     --ndk-dir=$NDK --overlay --arch=arm64
  ./build/tools/build-gcc.sh /tmp/ndk-$USER/src $NDK \
     aarch64-linux-android-4.8 --try-64

Change-Id: Ieaac9908cd2121981e257113cb8d5d3575c8718e
2014-02-04 17:36:55 +08:00
Tim Murray
b812b74be9 am 78133f53: Merge "Fix build"
* commit '78133f5323f110b574a471e37a560e90d7213481':
  Fix build
2014-02-03 23:37:55 +00:00
Tim Murray
78133f5323 Merge "Fix build" 2014-02-03 23:31:54 +00:00
Nick Kralevich
720b4e94e5 Fix build
This was broken due to 390ec00c6693fb20004f357901beae919a79329f
in frameworks/base

Change-Id: Ieaff5f34ef56efdd492af2f2e7c2294448223616
2014-02-03 15:25:34 -08:00
Raphael Moll
273f790b6b am 56142356: Merge "Update revision of Android SDK USB driver for Windows."
* commit '561423569c11698698450b87a91c7a94d5077e5f':
  Update revision of Android SDK USB driver for Windows.
2014-01-31 12:17:13 +00:00
Xavier Ducrohet
b63c132810 am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."
* commit '55089c32d599d2a7108e10728c59ad1f1b24384d':
  Android SDK Windows USB driver: Glass PID.
2014-01-31 10:26:49 +00: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
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
Adam Powell
35421b1229 Follow RecyclerView API changes
Change-Id: Ic273cc51cc9d7096a7a0d8b5f90accd5986e275a
2014-01-23 16:11:09 -08:00
Adam Powell
e40272d7dc Merge "Update sample for RecyclerView" into klp-modular-dev 2014-01-22 21:36:40 +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
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
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
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
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
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
Andrew Hsieh
0423f03064 am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit '28c9c34d8670266add371e9f0f33e4da52a024f4':
  Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:14:37 +00:00
Andrew Hsieh
b14ac43dbd am ca34e29d: Merge "Fix headers to be inclued alone"
* commit 'ca34e29d94056bfc20b6b9ea8b36b41763acfe61':
  Fix headers to be inclued alone
2014-01-16 09:09:58 -08:00
Andrew Hsieh
f991c5478e am 42bb3bca: Merge "Fix typo in comments in looper.h"
* commit '42bb3bcadc1611efa2632e83eb5d094f60b82263':
  Fix typo in comments in looper.h
2014-01-16 09:09:57 -08:00
Andrew Hsieh
28c9c34d86 am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
* commit '6d2d58de54169cd2cae9dbf3f69bd52af87daae5':
  Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:09:56 -08:00
Andrew Hsieh
ca34e29d94 Merge "Fix headers to be inclued alone" 2014-01-16 17:03:03 +00:00
Andrew Hsieh
42bb3bcadc Merge "Fix typo in comments in looper.h" 2014-01-16 17:02:47 +00:00