Commit Graph

8252 Commits

Author SHA1 Message Date
David 'Digit' Turner
81ee546174 am 8abfab1b: emulator: opengl: make internal tables const.
* commit '8abfab1baf04ebd57f8eff74485b746d56368014':
  emulator: opengl: make internal tables const.
2011-09-28 04:27:14 -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
Scott Main
15414295de am 026370ed: Merge "remove LOW_PROFILE flag when setting HIDE_NAVIGATION, because it\'s not needed in order to work"
* commit '026370edef39a1d8a7ad771288f1b78990e8c538':
  remove LOW_PROFILE flag when setting HIDE_NAVIGATION, because it's not needed in order to work
2011-09-27 19:32:41 -07:00
Vladimir Chtchetkine
d06502fc80 am e466a63a: Include correct endian.h file
* commit 'e466a63ab4a836d7977c12858860087ca66208fd':
  Include correct endian.h file
2011-09-27 19:32:17 -07:00
Scott Main
026370edef Merge "remove LOW_PROFILE flag when setting HIDE_NAVIGATION, because it's not needed in order to work" 2011-09-27 18:17:27 -07:00
Vladimir Chtchetkine
e466a63ab4 Include correct endian.h file
Apparently including sys/endian.h directly produces uninitialized endianness macros.
Should include target CPU-dependent header instead.

Change-Id: Ib16f0470d27baa085bf1675a403c02efa6f994c4
2011-09-27 15:41:12 -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
b37d7be300 am 3726ce2f: am e15c2737: Update minSdkVersion and targetSdkVersion.
* commit '3726ce2f32a692b2efdbb34a12d9ed1cc8e7f3bf':
  Update minSdkVersion and targetSdkVersion.
2011-09-27 13:12:53 -07:00
Flavio Lerda
3726ce2f32 am e15c2737: Update minSdkVersion and targetSdkVersion.
* commit 'e15c273703765bba82eb2f1b9872074cdd090755':
  Update minSdkVersion and targetSdkVersion.
2011-09-27 13:10:46 -07:00
David 'Digit' Turner
e02ae8b0ac am 009a020c: resolved conflicts for merge of 944b4f80 to master
* commit '009a020ce9eb72f2dc5b200da07b2a9a88862017':
  emulator: opengl: Back-port GLES emulation from the master tree.
2011-09-27 12:31:17 -07:00
David 'Digit' Turner
009a020ce9 resolved conflicts for merge of 944b4f80 to master
Change-Id: I83f38f345caa456466d86e46f4f3c94721b7ebd1
2011-09-27 21:27:20 +02:00
Chet Haase
e68d53fd04 DefaultLayoutAnimations should use GridLayout instead.
The 2-LinearLayout system the demo used to have had its quirks, but was
just plain awful once it ran on a smaller screen. The new GridLayout
makes for a much better experience.

Change-Id: Ie3fd65e125c82da8b0079f61bd91bf844dea9b03
2011-09-27 11:51:35 -07:00
Flavio Lerda
e15c273703 Update minSdkVersion and targetSdkVersion.
Bug: 5357790
Change-Id: I295639ff014090b95ce7eae8fcdb32a602594e6d
2011-09-27 08:59:34 +01:00
The Android Open Source Project
24af3f4705 am 778e703c: Reconcile with ics-factoryrom-release
* commit '778e703c9f8d09168975d6ed411419e6dafed221':
2011-09-26 12:13:30 -07:00
The Android Open Source Project
778e703c9f Reconcile with ics-factoryrom-release
Change-Id: Ifd0dc59d4f94017f6a5f119fe85a2d4d7d7f4278
2011-09-26 12:11:21 -07:00
Vladimir Chtchetkine
b3f2a50901 am 1bc31fe7: Some minor polishing.
* commit '1bc31fe7e08ea5fddbd61bf09059c5b2148eb043':
  Some minor polishing.
2011-09-23 14:44:36 -07:00
Vladimir Chtchetkine
1bc31fe7e0 Some minor polishing.
Change-Id: I2e8f2bf3671e9676f115aaa894684618087e979d
2011-09-23 14:41:46 -07:00
The Android Automerger
5fba1382ca merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-23 11:33:41 -07:00
Vladimir Chtchetkine
fbb67dd652 am 55d41f89: Sets right preview frame properties.
* commit '55d41f896988d1159a999aaacf12fe4077757d22':
  Sets right preview frame properties.
2011-09-23 10:12:10 -07:00
Vladimir Chtchetkine
55d41f8969 Sets right preview frame properties.
Don't cofuse preview window with preview frames. Preview frames are relevant only
in panoramic mode that receives frames via CAMERA_MSG_PREVIEW_FRAME callback.

Change-Id: Ibecb345e43ba452856b8ca75449264d8d354a9d5
2011-09-23 10:08:28 -07:00
Vladimir Chtchetkine
2500d177fd am 14985c43: Merge "Implements camera error reporting."
* commit '14985c43126c7a3f3012e38d97ed2fc158c38194':
  Implements camera error reporting.
2011-09-23 08:37:22 -07:00
Vladimir Chtchetkine
14985c4312 Merge "Implements camera error reporting." 2011-09-23 08:35:16 -07:00
Vladimir Chtchetkine
b3ea171655 Implements camera error reporting.
Change-Id: I5f4f4cd1baab60053e827e0605a92a123c7a086f
2011-09-23 08:34:08 -07:00
David 'Digit' Turner
944b4f80e5 am 6ddbd156: resolved conflicts for merge of 4e6af749 to gingerbread-plus-aosp
* commit '6ddbd1563d84a7b18607aa67c1f5f5e4095f816f':
  emulator: opengl: Back-port GLES emulation from the master tree.
2011-09-23 01:36:15 -07:00
David 'Digit' Turner
6ddbd1563d resolved conflicts for merge of 4e6af749 to gingerbread-plus-aosp
Change-Id: I3a8d71bd9b359a067c2a250db99e855e59c08854
2011-09-23 10:27:34 +02:00
Xavier Ducrohet
0bfd488eb7 am 20807343: (-s ours) am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge.
* commit '2080734362f7b6e361e9dff825464ccf56b492f6':
  Cherry-pick 7fb4cc from master. do not merge.
2011-09-22 23:42:37 -07:00
Xavier Ducrohet
2080734362 am 3a1eb8fc: (-s ours) Cherry-pick 7fb4cc from master. do not merge.
* commit '3a1eb8fc1c389585c18526b03cf6fa153fb9391f':
  Cherry-pick 7fb4cc from master. do not merge.
2011-09-22 23:39:47 -07:00
The Android Open Source Project
23dbed96d6 am 8fbf284c: Reconcile with ics-factoryrom-release
* commit '8fbf284cc83263a6b5ce37afe9a14e8f06d8c317':
2011-09-22 10:58:40 -07:00
The Android Open Source Project
8fbf284cc8 Reconcile with ics-factoryrom-release
Change-Id: Id586eed2642eaf5d2e3c21d063c9d13acf83f551
2011-09-22 10:57:16 -07:00
Scott Main
a338f8e02e am 24060d37: Merge "fix custom view sample to scale text based on screen density"
* commit '24060d3751fdb5c64afa6dbe07544b334c3ad8a9':
  fix custom view sample to scale text based on screen density
2011-09-21 18:17:38 -07:00
Scott Main
24060d3751 Merge "fix custom view sample to scale text based on screen density" 2011-09-21 18:15:44 -07:00
Scott Main
689a60dd25 fix custom view sample to scale text based on screen density
Change-Id: I2e08e90b7baa73a4e36bad9f6abb9364d7b471d1
2011-09-21 17:57:59 -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
Scott Main
175d60f7f4 am 194d1415: Merge "small HC Gallery updates to put alternative values in appropriate config and update manifest"
* commit '194d14155cbc7e1e3e5829068bd4210faaa8694f':
  small HC Gallery updates to put alternative values in appropriate config and update manifest
2011-09-21 16:00:01 -07:00
Scott Main
194d14155c Merge "small HC Gallery updates to put alternative values in appropriate config and update manifest" 2011-09-21 15:58:21 -07:00
Xavier Ducrohet
e9efb37374 am bec04f14: Merge "Build SDK with the new location for the system image."
* commit 'bec04f14fa6d401358f0830bfcb8bd95d4727df4':
  Build SDK with the new location for the system image.
2011-09-21 15:57:11 -07:00
Scott Main
a0038f1170 remove LOW_PROFILE flag when setting HIDE_NAVIGATION, because it's not needed in order to work
Change-Id: I4eb6aee12f00bc98d14e7f42476acaf75340ac26
2011-09-21 15:56:47 -07:00
Vladimir Chtchetkine
7435b03c94 am 4d7f7de7: Use actual JPEG quality when compressing picture
* commit '4d7f7de7007c7effd2518e581275fef32536c862':
  Use actual JPEG quality when compressing picture
2011-09-21 15:55:25 -07:00
Xavier Ducrohet
bec04f14fa Merge "Build SDK with the new location for the system image." 2011-09-21 15:54:57 -07:00
Scott Main
c05bf09001 small HC Gallery updates to put alternative values in appropriate config and update manifest
Change-Id: If55961ef28b1be5e500618f0a485328f9433e443
2011-09-21 15:39:15 -07:00
Vladimir Chtchetkine
4d7f7de700 Use actual JPEG quality when compressing picture
Sometimes framework chooses to override the default JPEG quality value (90), so we need to
respect that when compressing frame during picture taking.

Change-Id: Ic7ad8938d33d94d34ecd0b979e5c8c3e8246fd53
2011-09-21 15:33:18 -07:00
Xavier Ducrohet
7fb4cc5359 Build SDK with the new location for the system image.
Change-Id: I7e3e176d82e444989cd5501c009ea767e1446199
2011-09-21 15:30:00 -07:00
Vladimir Chtchetkine
aee2a8d6e2 am 68ec4ac8: Fix video format
* commit '68ec4ac828762745155be9662285d2174a7eff1e':
  Fix video format
2011-09-21 15:19:18 -07:00
Vladimir Chtchetkine
68ec4ac828 Fix video format
Apparently, video pixel format expected by the camera framework is YU12, and not YV12
as it was implemented.

Change-Id: Id33d8aa7f62f6e68276774ca2a7d25c04acd71cc
2011-09-21 14:55:29 -07:00
Vladimir Chtchetkine
c2cd9ae3f6 am 1f37cd45: Fix callback sequence on picture taking
* commit '1f37cd45f67c7fab0326d06934fc7d192b1fd7a5':
  Fix callback sequence on picture taking
2011-09-21 14:38:40 -07:00
Vladimir Chtchetkine
1f37cd45f6 Fix callback sequence on picture taking
Also fixes a bug in JPEG converter.

Change-Id: I5bbeec96ec2bb0a9a6a333a3798880bb0b837c65
2011-09-21 14:20:07 -07:00
Vladimir Chtchetkine
c175108ae0 am 318ae8e9: Merge "Adds media_profiles.xml file that is required for proper framework setup"
* commit '318ae8e9feddb5665a137c1b6f9c911cf50aeea0':
  Adds media_profiles.xml file that is required for proper framework setup
2011-09-21 07:21:07 -07:00
Vladimir Chtchetkine
318ae8e9fe Merge "Adds media_profiles.xml file that is required for proper framework setup" 2011-09-21 07:19:50 -07:00
Vladimir Chtchetkine
a88e749e29 Adds media_profiles.xml file that is required for proper framework setup
This file must be copied over to /system/etc directory inside the emulated system image.

Change-Id: Ia013ed20e1ce7a6f9a3ce162f86e0fd3c97ded31
2011-09-21 06:58:08 -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