Commit Graph

7924 Commits

Author SHA1 Message Date
The Android Automerger
6cb64b727a merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-03 14:52:24 -07:00
Raphael Moll
3d308aa22c SDK: generate support library package on build server.
Also fix packaging of system image (it had an extra root
directory in it, e.g. it was packaging android-4/armeabi-v7a/
instead of just armeabu-v7a/)

Change-Id: I0254b2680168d25103222f8871b2af37a7406b58
2011-10-01 23:44:08 -07:00
Raphael Moll
fdefc0238a SDK: tweak source package (add com.android. sources)
Change-Id: Id1ad2d482c7f0cf58c5832f321997bb3b57d1f24
2011-10-01 23:42:04 -07:00
The Android Automerger
1fdd56d80d merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-30 13:11:26 -07:00
Xavier Ducrohet
3e132a1a26 Fix sdk source prop to include proper layoutlib api level.
Change-Id: I532503a2cc06f507e2176c2114867adbf9afe94a
2011-09-30 10:03:53 -07:00
The Android Automerger
08b923bd68 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 18:45:25 -07:00
Wink Saville
de784d9131 Cherrypick 3bfbbe2 from master. do not merge.
Update version of apn configuration files to version 7

Bug: 5339656
Change-Id: I874be2efaead642ce24abab8824bf8a916a81271
2011-09-29 17:01:00 -07:00
The Android Automerger
1eaef40889 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-28 17:34:22 -07:00
Xavier Ducrohet
ad1076ab25 Make the SDK system image be voice enabled.
This is to show the phone activity.

Change-Id: I5b719f39b88257e473bd9e2af5f0eac618ea0c80
2011-09-28 15:42:37 -07:00
Raphael Moll
da9eabde86 SDK: Generate source packages as part of 'make sdk_repo'
Change-Id: Iaea55bae22b2af95993d0f97023a015f2c5a5e77
2011-09-28 11:26:20 -07:00
Raphael Moll
4dedff68c2 SDK: generate system-image.zip in sdk_repo
Also:
- in the images_*_source.props, we can't have the platform
  version name (the human readable string). It's not a valid
  property of the XML.
- disable the included-abi in the platform.

Change-Id: I3db62fde5e436bbe8f8e69eb1495ca4e6b954ba2
2011-09-27 20:17:07 -07:00
The Android Automerger
2fdcac0807 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 13:30:13 -07:00
Flavio Lerda
e15c273703 Update minSdkVersion and targetSdkVersion.
Bug: 5357790
Change-Id: I295639ff014090b95ce7eae8fcdb32a602594e6d
2011-09-27 08:59:34 +01:00
The Android Automerger
5fba1382ca merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-23 11:33:41 -07:00
Xavier Ducrohet
3a1eb8fc1c Cherry-pick 7fb4cc from master. do not merge.
Build SDK with the new location for the system image.

Change-Id: Ic632d4ef87171fd4ed3e1a5bed9693fb402065c0
2011-09-21 16:04:26 -07:00
The Android Automerger
4ec46e4894 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-21 06:28:37 -07:00
The Android Automerger
078e5d0ad5 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 20:43:00 -07:00
Raphael Moll
3acd4823bb SDK: use XSD v5 props when generating repository packages.
This requires sdk.git Change-Id I6993d6c4 to build
(to enable the use of XSD v5).

Change-Id: If3beb09ae4eef3990caf661b2d4cfbdfd8a6f86a
2011-09-17 22:50:43 -07:00
Raphael Moll
ec48ca3dff Win SDK: fix missing platforms-tools/dx.bat
In the new windows.atree, the batch file was missing the .bat extension.
This prevents the SDK Manager from recognizing platform-tools.

Change-Id: I885b748f9ce7f6ceeb9f7b9c35ca38f7b8029f55
2011-09-17 21:52:14 -07:00
Raphael
5dc10d55a4 Specify the full path to atree for the windows.atree. DO NOT MERGE.
Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.

Cherry-pick from master b2b5921

Change-Id: I13e532cdc4c0839b6fd7f2a3a149725940a02734
2011-09-16 21:38:13 -07:00
Xavier Ducrohet
405c094032 Rename Compatibility into support and move it to rev 4. DO NOT MERGE.
Cherry-pick from master e98f22d

Change-Id: I165a7aeb429a4288d6f693a7613a4a102e21dd5b
2011-09-16 21:38:08 -07:00
Raphael
bc16220756 Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.
This moves the copy/strip/rm logic for the Windows SDK
from the patch_windows_sdk.sh to a regular sdk-windows-x86.atree.

The bash script is still here to invoke atree and do whatever
cleanup we might want to do later.

This should make it easier to maintain the Windows SDK
by providing a structure similar to tools.atree.

This change requires build.git Change-Id: I22aae7a8 to
have rm/strip support in atree.

Cherry-pick from master e07f59a

Change-Id: Ia71fc69717eaee6e4d8d062144347db3326e4127
2011-09-16 21:38:03 -07:00
Xavier Ducrohet
dda48a45e0 Move sdk components to API 14. DO NOT MERGE.
Cherry-pick from master 71be098

Change-Id: I9dc0245fdd19660a4b08d454892df02a02810749
2011-09-16 21:37:54 -07:00
Xavier Ducrohet
ca4d7f2f74 Remove llvm/api file matching. DO NOT MERGE
We are moving to a single llvm executable able to handle all
API levels so this file (helping select the llvm exe depending
on target API is not needed anymore).

Cherry-pick from master 73aa4b5

Change-Id: Icc9b035740679eacfa59d452f71e71355816f7be
2011-09-16 21:37:49 -07:00
Eric Fischer
43249f5d3c Import revised translations. DO NOT MERGE
Change-Id: I1d7e1bebe296c4b32e90f2a9e04cea263e53674d
2011-09-16 15:15:25 -07:00
David 'Digit' Turner
b13cf4ac31 emulator: opengl: Fix the Windows SDK build
Change-Id: I97be6f81af321f75ff5d43b258387fdc039f0210
2011-09-15 12:14:31 +02:00
Svetoslav Ganov
1a4cc125d1 Update API demos to show ActionProvider demo for at least ICS
bug:5033542

Change-Id: Icea34fb21e04ee7c40ccca6894d9a24544d6c816
2011-09-14 19:42:45 -07:00
Vladimir Chtchetkine
f48f6f359d Merge "Fix locking issues in the callback notifier" 2011-09-14 14:50:24 -07:00
Vladimir Chtchetkine
ba78a2f1d3 Fix locking issues in the callback notifier
Holding an object lock while macking the callbacks cause deadlocks
due to reentrance to the callabck notifier.

Change-Id: I5f2780989798ebf5c5d7aab34ac233bb5952079d
2011-09-14 14:24:03 -07:00
Scott Main
d21f82d678 Merge "rewrite HC Gallery app to support phones. In summary, this change:" 2011-09-14 14:14:09 -07:00
Vladimir Chtchetkine
4756fada1a Fix typos introduced during style adjustment
Change-Id: Ia9ca4849d4a410aea9d49d2c6246d36c4c7fc8f1
2011-09-14 13:56:48 -07:00
Vladimir Chtchetkine
4d47360672 Fix capture stopping
When stopping the camera, the working thread should be stopped before sending
"stop" query to the emulator: we don't want "frame" queries to be floating around
while we're in the process of stopping the camera.

Change-Id: I16dc56ca1c2e304a07a074302001d2e27100f2ac
2011-09-14 07:06:23 -07:00
Vladimir Chtchetkine
16232484c7 Fix build
Change-Id: Ifb5dd0b11bd616ef5a5a1e79b510b00f1d55672a
2011-09-13 16:02:51 -07:00
Vladimir Chtchetkine
5467be2eef Refactored emulated camera HAL to comply with code style
Change-Id: If57b536ae6b1f9bad4213630488591a3b3cc9fdd
2011-09-13 14:35:25 -07:00
Vladimir Chtchetkine
492332c295 Merge "Implements connection with the emulator" 2011-09-13 09:45:09 -07:00
Vladimir Chtchetkine
33bda47528 Implements connection with the emulator
Change-Id: Ie3910a98e927f7b8ea556c403f8ced27e06bcdec
2011-09-13 09:44:32 -07:00
David 'Digit' Turner
0db6e8dd27 Merge "emulator: opengl: Support named pipes on Win32" 2011-09-13 07:32:29 -07:00
David 'Digit' Turner
b065016640 Merge "emulator: opengl: Add support for unix sockets." 2011-09-13 07:02:38 -07:00
David 'Digit' Turner
bde30e7480 Merge "emulator: opengl: re-enable gralloc builds" 2011-09-13 06:20:29 -07:00
David 'Digit' Turner
3abd13d4d6 emulator: opengl: Support named pipes on Win32
This patch adds support for Win32 named pipes for the communication
channel between the Opengl renderer library and its clients.

Named pipes should be much faster than local TCP sockets on this
platform. Note that by default, TCP sockets are still used. The
emulator needs to call setStreamMode(STREAM_MODE_PIPE) to be able
to use these.

Change-Id: I86d36624cf2b7fdd50f41e1e43c908348dca4657
2011-09-13 14:04:49 +02:00
David 'Digit' Turner
3d76ec1e3c emulator: opengl: Add support for unix sockets.
This patch allows the OpenGLES rendering library to use Unix
sockets instead of TCP ones when communicating with its clients.
On certain benchmarks (e.g. 0xBench teapot), this provides a
noticeable improvement (x1.05 fps) without any other changes.

On practice, Unix sockets are faster than TCP sockets, even
local ones. Also, this introduces a moderate amount of
abstraction that will allow us to use Win32 named pipes
on Windows (where TCP sockets are much slower than they
are on Unix).

Note that by default, TCP streams are still used.
The client (emulator) must call the new API 'setStreamMode'
to change it to STREAM_MODE_UNIX between 'initLibrary' and
'startOpenglRenderer' calls.

+ Adjust callers / user appropriately.

Change-Id: I4105bbf07541f3146b50a58d1a5b51e8cf044fab
2011-09-13 14:03:32 +02:00
David 'Digit' Turner
3598af3850 emulator: opengl: add missing pthread_mutex_destroy
Change-Id: Ib6be00619e06f5ff492a080d1feb2954b626fa26
2011-09-13 14:02:37 +02:00
David 'Digit' Turner
c308bfc05f emulator: opengl: re-enable gralloc builds
This re-enables the build of the gralloc GLES emulation library.

This is only for experimentation / debugging purpose. GLES emulation
is still disabled by default in the emulator. Even if you force-enable
it by using the '-gpu on' flag, this module will not properly yet
and nothing will be displayed.

Change-Id: I8f0ca8805ed99037b011365d08507ca08bff5e75
2011-09-13 13:59:53 +02:00
Vladimir Chtchetkine
455e444a1f Merge "Fake camera implementation" 2011-09-12 08:51:18 -07:00
Vladimir Chtchetkine
b97c2f0b59 Fake camera implementation
The code submitted here builds a camera.goldfish.so module that encapsulates a camera HAL.

The major components of the camera HAL implementation are:
* Generic HAL module implemented in emulated_camera_hal.cpp There is nothing much
  to it: just exporting the required HAL header.
* EmulatedCameraFactory class that manages emulated cameras, and provides handling for
  camera_module_methods_ methods. There is only one object of this class, that is statically
  instantiated when camera.goldfish.so module is loaded.
* EmulatedCamera class that implements camera_device_ops_t API. Objects of this class are
  instantiated during EmulatedCameraFactory construction, and they interact with objects
  of EmulatedCameraDevice class to get frames.
* EmulatedCameraDevice class encapsulates an actual camera device. Objects of this class
  are contained in EmulatedCameraDevice objects, and interact with them as required by the
  API.

The fake camera implementation is shared between EmulatedFakeCamera, and EmulatedFakeCameraDevice
classes. They are pretty light. In fact, EmulatedFakeCamera is nothing more than just a
placeholder for EmulatedFakeCameraDevice instance, and EmulatedFakeCameraDevice does nothing
more, than just drawing a checker board with a bouncing square.

Other components / routines are minor: helpers, wrappers, etc. The code is heavily commented,
so there will be plenty of explanations between the lines.

Change-Id: I4463e14c255c6e3b1dcca17bed5f4efde32d9879
2011-09-12 08:37:48 -07:00
Stephen Hines
bbc0bd4936 Merge "Bump minimum SDK version to 14." 2011-09-09 15:59:38 -07:00
Stephen Hines
2f8b09d926 Bump minimum SDK version to 14.
BUG=5280704

Change-Id: Ib26b93f4b41b5c910afaa49b4420d9bd4272acd9
2011-09-09 14:49:44 -07:00
Raphael
f31a96aa9f SDK packaging for unified llvm-rs-cc binary.
Change-Id: I73971ade5bddadd2f395d098e5a083a6f683c302
2011-09-08 16:42:12 -07:00
Jake Hamby
5cba0d859e Merge "Exclude some non-source folders from IntelliJ projects." 2011-09-07 13:27:10 -07:00
Scott Main
ddd0d0c656 rewrite HC Gallery app to support phones. In summary, this change:
- moves tablet-style layouts to layout-large* directories
- adds ContentActivity to host the ContentFragment when on phones
- adds an OnItemSelectedListener interface to TitlesFragment, which MainActivity
  implements in order to receive callbacks on click events to the list item and then
  pass the selected item to the ContentFragment in the manner appropriate for the
  current configuration... Specifically, when in two-pane mode, it updates the ContentFragment
  directly, and when in single-pane mode, it starts the ContentActivity with intent data
  about the selected item, which then updates the ContentFragment
- Change CameraSample.java to CameraActivity.java for name conventions
- Moves all menu strings into string resources
- Fixes camera sample to properly handle front-facing camera on other devices (was broken
  on nexus s and on g-slate)
- Fixes camera sample to handle resume state after the camera has changed (for example, when
  switched to a different camera, it would crash on resume)
- Moves various code around between classes as appropriate for the fragment handling the
  action. For example, move the ActionBar.TabListener implementation to the TitlesFragment
  (was originally impemented by the MainActivity)
- Adds logic to support devices without camera and properly declare the camera in manifest as such
- Maintains the state of hidden titles list across restarts

Change-Id: I27a39a68dee37325c0c3607aa0b56ab6c134d026
2011-09-06 18:24:49 -07:00