Commit Graph

13360 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
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
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
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
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
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
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
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
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
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
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
Andrew Hsieh
6d2d58de54 Merge "Fixed asset_manager.h, rect_manager.h, and jni.h" 2014-01-16 17:02:36 +00:00
Andrew Hsieh
2c8776805a Fix headers to be inclued alone
See b.android.com/64679 for one of header sys/prctl.h

Change-Id: Ie415ebe2086d2f0190d84fba0c57cc7e1e5822ae
2014-01-13 12:58:46 +08:00
Andrew Hsieh
1c9e736166 am 3517e742: Merge "Implement wait4 already exist in header"
* commit '3517e742e3df5a61e622204dbb8d4110b5bad3ac':
  Implement wait4 already exist in header
2014-01-09 16:36:48 -08:00
Andrew Hsieh
3517e742e3 Merge "Implement wait4 already exist in header" 2014-01-10 00:31:50 +00:00
Andrew Hsieh
d980848377 Fix typo in comments in looper.h
Remove android-13's looper.h because it's identical to android-9's
Note that ndk/platforms/android-N only keep delta to previous level

Change-Id: Ibd2c3e168cfe7f6902fdc6eca2e2778d8ccf1fac
2014-01-08 17:24:22 +08:00
Andrew Hsieh
fbb32955a4 Fixed asset_manager.h, rect_manager.h, and jni.h
1. Fixed missing #include <sys/types.h> in android/asset_manager.h for API >= 13
2. Fixed missing #include <stdint.h> in android/rect_manager.h for API >= 14
3. Added JNICALL to JNI_OnLoad and JNI_OnUnload in jni.h

Change-Id: I875ec0b6e6f7c2f433c176f0a738eb78f3c33062
2014-01-08 14:10:06 +08:00
Deepanshu Gupta
bc0b4a804f Bundle Noto fonts with the SDK
Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
2014-01-08 01:44:45 +00:00
Xavier Ducrohet
d3795c4da6 am 8c2f72eb: am 0a56aecd: Update build tools to 19.0.2
* commit '8c2f72ebc8a34704da0f9dce5cf53cf7f8afeee2':
  Update build tools to 19.0.2
2014-01-07 10:06:50 -08:00
Xavier Ducrohet
c7e44de196 am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
* commit 'cd171fd352aa8e6e1d1bc903038a81b7702f6d7a':
  Properly package the RS support bc file.
2014-01-07 10:06:49 -08:00
Xavier Ducrohet
8c2f72ebc8 am 0a56aecd: Update build tools to 19.0.2
* commit '0a56aecdbbfb3e3e08a73c7411f41f5c7f0cabaa':
  Update build tools to 19.0.2
2014-01-07 10:03:43 -08:00
Xavier Ducrohet
cd171fd352 am 7f15ddd5: Properly package the RS support bc file.
* commit '7f15ddd546be5203f8de654ff36885f629490813':
  Properly package the RS support bc file.
2014-01-07 10:03:42 -08:00
Andrew Hsieh
e89c4f7f47 am 365e66fe: Merge "Fixed API18 math.h for clang3.4"
* commit '365e66feaf8f653fdc1618f6e220207a28bb4bc6':
  Fixed API18 math.h for clang3.4
2014-01-06 16:26:01 -08:00
Andrew Hsieh
365e66feaf Merge "Fixed API18 math.h for clang3.4" 2014-01-07 00:21:56 +00:00
Xavier Ducrohet
0a56aecdbb Update build tools to 19.0.2
Change-Id: I339c292aece1101a6afaf89db20a9d985427e561
2014-01-02 16:24:41 -08:00
Xavier Ducrohet
7f15ddd546 Properly package the RS support bc file.
Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
2014-01-02 16:24:21 -08:00
Andrew Hsieh
f242723e9d Fixed API18 math.h for clang3.4
Clang3.4 can take __builtin_nexttoward and __builtin_nexttowardf.
Also fix a minor typo in comment

Change-Id: If98a35e2e38c45ebd619b0ceb6c5ee41acc4e415
2013-12-30 14:14:09 +08:00
Andrew Hsieh
cbe870105d am 29c857fe: Merge "Restore immersive mode when volume button has been pressed."
* commit '29c857fe6df5362ed16f2748d2447fe76209e2cb':
  Restore immersive mode when volume button has been pressed.
2013-12-29 22:05:58 -08:00