Jason Sams
dd1b1981c3
Merge "Put the compute samples back in the SDK." into jb-dev
2012-05-16 15:08:11 -07:00
Jason Sams
8cb9623c6d
Put the compute samples back in the SDK.
...
Change-Id: Idda5b632750e52eecf3a16205a0ff14af17b2e1b
2012-05-16 13:00:38 -07:00
Raphael Moll
30298a6c26
am 91ab8ff8: am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"
...
* commit '91ab8ff8260e2dd27a3537fdbb20720c0391e2ce':
Fix Mac SDK: sed s/--in-place/-i/
2012-05-16 09:14:27 -07:00
The Android Open Source Project
0e09ff0879
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I7609d4ca3f8fdfff4173ac67c0aa2b47c2210751
2012-05-16 08:40:02 -07:00
The Android Automerger
8d4e6ceead
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-16 07:43:34 -07:00
The Android Automerger
8e58a756b2
merge in jb-release history after reset to jb-dev
2012-05-16 07:00:24 -07:00
Raphael Moll
495f0c27a5
resolved conflicts for merge of cf390116 to jb-dev-plus-aosp
...
Change-Id: Ia215d78fbeefc59ccd1868fe1365f4260b561e24
2012-05-15 20:24:51 -07:00
Raphael Moll
91ab8ff826
am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"
...
* commit '69ce67b42dca77762b18c3a1770a6a32e8c51bbf':
Fix Mac SDK: sed s/--in-place/-i/
2012-05-15 18:38:41 -07:00
Raphael Moll
69ce67b42d
Merge "Fix Mac SDK: sed s/--in-place/-i/"
2012-05-15 17:45:52 -07:00
Raphael Moll
cf3901168b
SDK: don't generate empty codename line in source.properties. DO NOT MERGE.
...
SDK Bug: b/6490860
Change-Id: I3fbc0b710db891a1649138c8badf4ad88d6e2507
2012-05-15 17:37:44 -07:00
Raphael Moll
877b365e36
Fix Mac SDK: sed s/--in-place/-i/
...
Change-Id: Idd6481fd86c62596e95647bd3acaedf1a7158640
2012-05-15 17:22:50 -07:00
Duane Sand
e65ef1be32
Add Mips support to SDK.
...
Change-Id: Iac67fbb326c09db8b6d79b0852165acf1272d307
Signed-off-by: Duane Sand <duanes@mips.com >
2012-05-15 15:23:52 -07:00
Raphael Moll
c96a1dae1d
am c678e6a5: am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."
...
* commit 'c678e6a5353126ec97d3db4911d8e630fdebe384':
Fix SDK: don't generate empty codename line in source.properties.
2012-05-15 13:38:07 -07:00
Raphael Moll
c678e6a535
am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."
...
* commit 'd721f0e2c2d800743f315e39f29081db6362c850':
Fix SDK: don't generate empty codename line in source.properties.
2012-05-15 13:35:31 -07:00
Raphael Moll
d721f0e2c2
Merge "Fix SDK: don't generate empty codename line in source.properties."
2012-05-15 13:28:56 -07:00
Raphael Moll
c52a37f326
am f9f9ea96: am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."
...
* commit 'f9f9ea96c1ec64a4b3796c077714e1c100dc3be4':
SDK: don't generate empty codename line in source.properties.
2012-05-15 13:17:55 -07:00
Raphael Moll
f9f9ea96c1
am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."
...
* commit '66493c9e6ac3ec87f33347bea745b43b04519bd1':
SDK: don't generate empty codename line in source.properties.
2012-05-15 13:15:48 -07:00
Raphael Moll
8707207977
Fix SDK: don't generate empty codename line in source.properties.
...
This fixes commit 41a7acfa6b .
Change-Id: I3cc6ee0efea53fd0469c29fb0ffa87d727b15431
2012-05-15 12:26:37 -07:00
SeongJae Park
b9ca48dc1d
Fix old style edit text drawable display error.
...
[Problem]
LinearLayout5, RelativeLayout2 of ApiDemos has text input field
display error.
[Cause]
They use Holo theme although text input field use old style edit text
drawable as background.
[Solution]
Use default edit text without custom background for RelativeLayout2,
LinearLayout5 sample.
Change-Id: I102bf267119ba0903bd17e898b525af0aa2f0c5d
Signed-off-by: SeongJae Park <sj38.park@gmail.com >
2012-05-16 02:53:26 +09:00
Raphael Moll
66493c9e6a
Merge "SDK: don't generate empty codename line in source.properties."
2012-05-15 10:37:04 -07:00
Raphael Moll
41a7acfa6b
SDK: don't generate empty codename line in source.properties.
...
SDK Bug: b/6490860
Change-Id: I1eb7090eedca961a2a71a18e5dcef68e6cbf7163
2012-05-14 21:00:01 -07:00
The Android Automerger
71423872ab
merge in jb-release history after reset to jb-dev
2012-05-14 07:00:16 -07:00
Raphael Moll
b06504185e
SDK: Ability to generate repos in XSD repository-7.
...
Change-Id: Idc4c75a99625342128e59ea06fe8d30c5b2f56b7
2012-05-10 23:24:19 -07:00
Dianne Hackborn
47c76a815c
am f2bc2a02: Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
...
* commit 'f2bc2a024cbcf12500c598dc97f71cfcb0168007':
Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
2012-05-10 15:36:09 -07:00
Dianne Hackborn
f2bc2a024c
Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
...
...incorrect visibility when the ActionBar overflow menu is opened
Improve API demos.
Change-Id: I3e831152a0dbb56270a80cf58e9441b55059c884
2012-05-10 15:26:52 -07:00
Jean-Michel Trivi
3378371247
am f6b7dd7e: Merge "Add FLAC encoder to the list of media codecs." into jb-dev
...
* commit 'f6b7dd7e7d6cd9c8ee18f6b8c9fba2f26a50bd35':
Add FLAC encoder to the list of media codecs.
2012-05-10 10:45:17 -07:00
Jean-Michel Trivi
f6b7dd7e7d
Merge "Add FLAC encoder to the list of media codecs." into jb-dev
2012-05-10 09:55:15 -07:00
Jean-Michel Trivi
cb62e8bf28
Add FLAC encoder to the list of media codecs.
...
Bug 5525503
Change-Id: I2326bfec38dbbb641d8c32f5dee98da9da6c3a83
2012-05-09 15:54:27 -07:00
Xavier Ducrohet
1ccd581a94
am 6bd1ae5e: Fix skin.
...
* commit '6bd1ae5e75a7ac67a72d15d6f0900284eaa4ea51':
Fix skin.
2012-05-09 01:45:28 -07:00
The Android Automerger
d587082b9a
merge in jb-release history after reset to jb-dev
2012-05-08 08:14:21 -07:00
Xavier Ducrohet
6bd1ae5e75
Fix skin.
...
Bug: 6447905
Change-Id: I50779c5c343ed9f0bf432336b861153e9b047f07
2012-05-07 18:14:36 -07:00
The Android Automerger
c9008fb4ac
merge in jb-release history after reset to jb-dev
2012-05-07 07:00:22 -07:00
Guang Zhu
7969e2fd95
am 5cbd4839: Merge "more fixes to monkey motion event timing" into jb-dev
...
* commit '5cbd4839f28b5f33573e926e24c204036c7baa73':
more fixes to monkey motion event timing
2012-05-06 17:15:34 -07:00
Guang Zhu
5cbd4839f2
Merge "more fixes to monkey motion event timing" into jb-dev
2012-05-06 17:13:21 -07:00
Dianne Hackborn
f56f5e4a46
am f5d3a23d: Improvements to system UI demos.
...
* commit 'f5d3a23dee245962af09d7e97bb3e4080e6d5c39':
Improvements to system UI demos.
2012-05-06 12:52:24 -07:00
Dianne Hackborn
f5d3a23dee
Improvements to system UI demos.
...
- Content browser now lets you long press to go into selection mode.
- Overscan demo has more options for controlling more window state.
Change-Id: I04cfb58f515882cc6dccd65cb68bc073e53dcad5
2012-05-06 12:44:34 -07:00
Guang Zhu
77dc0d2eab
more fixes to monkey motion event timing
...
Last attempt to fix ACTION_MOVE ended up breaking stuff
elsewhere.
For a touch based gesture, it usually have a group of motion
events, and typically they have the same down time and individual
event times. Example: a tap should have ACTION_DOWN with same
down time and event time, and subsequent ACTION_UP should have
the same down time as previous one, but a fresh event time.
Similar situation applies to ACTION_DOWN, ACTION_MOVEs,
ACTION_UP sequence of a drag/scroll/fling gesture
In addition, a 5ms delay is added for a tap between DOWN and
UP. And a 5ms delay is added for each injected event in a drag
gesture
Change-Id: I8e65e578152b1c1ff1fa4c0f476ef45806826479
2012-05-04 14:06:50 -07:00
Trevor Johns
37f155bca5
am ccbf6813: am 90e9900c: Merge "Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support"
...
* commit 'ccbf6813f655e4db84671796c0da15b208c4d54b':
Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support
2012-05-04 09:19:07 -07:00
Trevor Johns
ccbf6813f6
am 90e9900c: Merge "Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support"
...
* commit '90e9900c444dc1270646c6d0190e4e7b48a89665':
Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support
2012-05-03 19:34:32 -07:00
Trevor Johns
90e9900c44
Merge "Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support"
2012-05-03 18:30:25 -07:00
The Android Automerger
9139f46f85
merge in jb-release history after reset to jb-dev
2012-05-03 07:03:51 -07:00
Andrew Hsieh
3d1461454c
am 7d8febcb: am 56849da6: Merge "[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain"
...
* commit '7d8febcb1a8c2c0b5a77e6d78c7637433a83071c':
[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain
2012-05-02 20:07:52 -07:00
Andrew Hsieh
7d8febcb1a
am 56849da6: Merge "[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain"
...
* commit '56849da62cb54b9ea105895b2d65e5f40328fa41':
[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain
2012-05-02 20:06:03 -07:00
Andrew Hsieh
56849da62c
Merge "[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain"
2012-05-02 19:32:35 -07:00
Raghu Gandham
ae9a5f960c
[MIPS] Import signal.h from bionic. This version fixes the
...
warning emitted by the toolchain
2012-05-02 18:46:58 -07:00
Andy Stadler
23cad5aa2d
am a8863a96: Eclipse classpath cleanup
...
* commit 'a8863a96142779d89b65f71a5cab4e2ad1e6fd97':
Eclipse classpath cleanup
2012-05-02 11:44:18 -07:00
Andy Stadler
a8863a9614
Eclipse classpath cleanup
...
- removed UnifiedEmail, not used in JB
- updated references to media/mca packages, which moved
- libcore junit stuff is now accessed via a library, built from external
Bug: 5584451
Change-Id: Ia5358c66ba191a3a08fea731ad5d8ba3e93c1f89
2012-05-02 11:32:16 -07:00
Kartic Grover
a1843415aa
Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support
...
2D canvas DrawVertex to create a vector graphic background
touch & keypad playable
landscape & portrait for all known device sizes. All measurements in DP and nicely scaling.
using xml drawables to rotate "dpad" arrow
Change-Id: I995acaaf0935c13c03fcbcf974ce5af06f46780e
2012-05-02 09:43:34 -07:00
The Android Automerger
80b9b1ebde
merge in jb-release history after reset to jb-dev
2012-05-02 07:01:45 -07:00
Adam Powell
c774a88a24
am ffb145ce: Follow framework API change in TaskStackBuilder
...
* commit 'ffb145cea250808c2a72108c915ae04bd15d3833':
Follow framework API change in TaskStackBuilder
2012-05-01 19:14:31 -07:00