Jason Sams
edcc4754ee
am dd1b1981: Merge "Put the compute samples back in the SDK." into jb-dev
...
* commit 'dd1b1981c33fad38567d4d1e2d56f5ac89ad8101':
Put the compute samples back in the SDK.
2012-05-16 15:12:56 -07:00
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
Eino-Ville Talvala
423e93e49d
Merge "EmulatedFakeCamera2: Support construct_default_request HAL method."
2012-05-16 11:55:27 -07:00
Eino-Ville Talvala
6d9c46f3ea
Merge "EmulatedFakeCamera2: Update to match camera_metadata changes"
2012-05-16 10:59:14 -07:00
Raphael Moll
2f7bfd3907
am 30298a6c: am 91ab8ff8: am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"
...
* commit '30298a6c26b0ce10e9eb5251d583648411d6eacf':
Fix Mac SDK: sed s/--in-place/-i/
2012-05-16 09:17:31 -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
a177a61a14
am 0e09ff08: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '0e09ff0879a37bf6609238f768907de8a03ffbe4':
fix how monkey adjust timestamps for motion events
Fix Monkey key events.
Ensure Monkey uses sane timestamps for key events.
2012-05-16 08:42:44 -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
29f09a9beb
am 495f0c27: resolved conflicts for merge of cf390116 to jb-dev-plus-aosp
...
* commit '495f0c27a5afa48033c221a46ea29f6fb9dbffb0':
SDK: don't generate empty codename line in source.properties. DO NOT MERGE.
2012-05-15 20:30:34 -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
Eino-Ville Talvala
ab463b3ece
EmulatedFakeCamera2: Support construct_default_request HAL method.
...
Bug: 6243944
Change-Id: I888fefae0b08532862171323774808cf241cdad1
2012-05-15 14:56:54 -07:00
Raphael Moll
a3b9db0bfd
am c96a1dae: am c678e6a5: am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."
...
* commit 'c96a1dae1d6700b36dd7d0bb2432c55bff2cb396':
Fix SDK: don't generate empty codename line in source.properties.
2012-05-15 13:42:24 -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
201960ab89
am c52a37f3: am f9f9ea96: am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."
...
* commit 'c52a37f326ab111bd70ff170df225aaa16d1da8d':
SDK: don't generate empty codename line in source.properties.
2012-05-15 13:19:37 -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
Eino-Ville Talvala
bb54bb03ec
EmulatedFakeCamera2: Update to match camera_metadata changes
...
Bug: 6243944
Change-Id: I3ff301829827b7e694c371efe7915667d9a66493
2012-05-14 18:08:18 -07:00
Eino-Ville Talvala
7479f77186
Merge "Add minimal operation to new fake camera emulator."
2012-05-14 18:03:37 -07:00
The Android Automerger
71423872ab
merge in jb-release history after reset to jb-dev
2012-05-14 07:00:16 -07:00
Brett Chabot
d2d16091aa
Fix Eclipse classpath.
...
Remove Exchange/src, and add junit-runner.
Change-Id: I786a8732bf78413e96454f2201edc75f9ab639ac
2012-05-11 14:27:28 -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
Eino-Ville Talvala
61fbf61670
Add minimal operation to new fake camera emulator.
...
- Rework to match latest camera 2 HAL.
- Somewhat realistic scene lighting simulation, for allowing a
realistic range of exposure and gain values.
- Supports raw Bayer sensor data only, at 640x480
- Only one stream configurable
- No support for reprocessing, 3A, flash, YUV, JPEG, etc
Bug: 6243944
Change-Id: I14fbad58ffeff37162c56d9daff7e4f75ab879c3
2012-05-10 16:23:28 -07:00
Dianne Hackborn
eea5f58180
am 47c76a81: am f2bc2a02: Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
...
* commit '47c76a815cc978e30c7b64708879d6175b129b0f':
Work on issue #6475693 OnSystemUiVisibilityChangeListener reporting...
2012-05-10 15:38:22 -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
0d6a581375
am 33783712: am f6b7dd7e: Merge "Add FLAC encoder to the list of media codecs." into jb-dev
...
* commit '3378371247ce4c4ac9b40325b411005de5a554ca':
Add FLAC encoder to the list of media codecs.
2012-05-10 11:57:03 -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
1af872f6cf
am 1ccd581a: am 6bd1ae5e: Fix skin.
...
* commit '1ccd581a94fed7a92b8d2d63cf590f34a533e4a7':
Fix skin.
2012-05-09 01:55:08 -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
Xavier Ducrohet
4f39b9bf12
Fix skin.
...
Change-Id: I50779c5c343ed9f0bf432336b861153e9b047f07
2012-05-07 17:15:14 -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