Dianne Hackborn
d79a09095c
New API demo showing how to make a resource reference.
...
Change-Id: I450d70432debc9d7f58a7f6597628dacc0225ddd
2011-07-01 15:08:44 -07:00
Dianne Hackborn
46781c155d
Merge "Follow internal impl change."
2011-06-30 13:57:33 -07:00
Jeff Brown
a5be101172
Merge "ApiDemos: Fix array indexing bug in game controller demo."
2011-06-30 12:43:13 -07:00
Jeff Brown
f53e7c9863
ApiDemos: Fix array indexing bug in game controller demo.
...
Change-Id: Ic7f1ce8bed39b2c10dd0e583c3ad118095f14752
2011-06-30 12:01:10 -07:00
Dianne Hackborn
5480519835
Follow internal impl change.
...
Change-Id: I61e545306182e106723e74f28650c165dcdab19a
2011-06-30 11:23:55 -07:00
David Hu
64fee8fe80
Merge "Emulator Connectivity Test"
2011-06-29 17:03:34 -07:00
David Hu
a69cb1fd38
Emulator Connectivity Test
...
The test checks if there is an activity connectivity and if so can a connect be made. The test was verified again the following scenarios:
- airplane mode on (FAIL)
- wifi on only (PASS)
- data on only (PASS)
- radio on but data and wifi off (FAIL)
- data and wifi on (PASS)
Change-Id: I3c400280390f00f52bdc73c8a685f33322d821eb
2011-06-29 16:55:55 -07:00
David 'Digit' Turner
05c6bed0ab
am f249fb4f: am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit 'f249fb4fe0f5424389fe52e09baf3af1db9a4a55':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 04:20:10 -07:00
Anirudh Dewani
d9662df316
am 12c15c51: (-s ours) am bc4ea2d9: am fea911d5: Network detection sample using TelephonyManager
...
* commit '12c15c512b8f21ad05777cadd1942d80a494b9bf':
Network detection sample using TelephonyManager
2011-06-29 04:20:08 -07:00
David 'Digit' Turner
f249fb4fe0
am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit 'eff8b9de35890bf50093d38ef5e9e81557ad4a9c':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:51:26 -07:00
David 'Digit' Turner
eff8b9de35
am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
...
* commit '39386d450fdc2f170f5f7c94d76c38061fd5a9e0':
sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:46:04 -07:00
David 'Digit' Turner
39386d450f
Merge "sdk: Copy ABI-specific kernel image to platform image directory."
2011-06-29 02:42:09 -07:00
David 'Digit' Turner
f7f6842b32
sdk: Copy ABI-specific kernel image to platform image directory.
...
This patch depends on https://review.source.android.com/24052
It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.
This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
prebuilt/android-arm/kernel/kernel-qemu
Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
2011-06-29 11:32:17 +02:00
Anirudh Dewani
12c15c512b
am bc4ea2d9: am fea911d5: Network detection sample using TelephonyManager
...
* commit 'bc4ea2d9326f24097b0fdd8ca7090688c0f6743b':
Network detection sample using TelephonyManager
2011-06-29 02:18:53 -07:00
Anirudh Dewani
bc4ea2d932
am fea911d5: Network detection sample using TelephonyManager
...
* commit 'fea911d5359f1eb42ff8b9c70cd6f51500f539d4':
Network detection sample using TelephonyManager
2011-06-29 02:16:23 -07:00
Dianne Hackborn
d9344bb5fd
Merge "Add API demo for LocalBroadcastManager."
2011-06-28 14:42:35 -07:00
Jeff Brown
0459e026ac
Merge "Add a sample for handling hover events."
2011-06-28 14:36:15 -07:00
Jeff Brown
402adc44c2
Add a sample for handling hover events.
...
Change-Id: I9e19e09d3f5b8d0fd03f52cc8d88e6a12399d12f
2011-06-28 14:28:57 -07:00
Debashish Chatterjee
6b47b8888c
Merge "Copied recent VoicemailContract changes from framework/base/core to VoicemailProviderDemo."
2011-06-28 10:48:51 -07:00
Debashish Chatterjee
8e385c5809
Copied recent VoicemailContract changes from framework/base/core to VoicemailProviderDemo.
...
Change-Id: I506d5ef224494bdfe074aa0065327c2fba205373
2011-06-28 17:40:55 +01:00
Narayan Kamath
0de2b685b2
Merge "Add sample TTS engine"
2011-06-28 08:58:06 -07:00
David Turner
044c984966
am 868d4286: am 4e9130a6: am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit '868d42866648d023c5331e4d74aa6c7e130ea7ee':
emulator opengl: fixed wrong delete
2011-06-28 05:12:12 -07:00
David Turner
92d5f9009a
am cb4d9ff2: am 26025f17: am 5b060ef9: Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* commit 'cb4d9ff2a816f67c224c31be3a39135b69d372a6':
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 05:12:10 -07:00
David Turner
b554ee726a
am 1cac4c47: am b072bc8b: am 052effb8: Merge "Fix an iligal "free"."
...
* commit '1cac4c47878f890118bcca65906865c1b7f31a0d':
Fix an iligal "free".
2011-06-28 05:12:08 -07:00
David Turner
0a22cbfbd3
am 4c5e4e11: am f222e481: am 7c91ae77: Merge "tex 0 is legal."
...
* commit '4c5e4e1166d82096fa537a5b56e4534ddbf2f641':
tex 0 is legal.
2011-06-28 05:12:06 -07:00
David Turner
5ee0507fc6
am b955e57d: am ab37200b: am de74b496: Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
...
* commit 'b955e57dc3e9052333c25932aa16c7f123ee6deb':
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
2011-06-28 05:12:03 -07:00
David Turner
868d428666
am 4e9130a6: am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit '4e9130a6f49bec0caceba6974b082a21f244b2c1':
emulator opengl: fixed wrong delete
2011-06-28 04:59:24 -07:00
David Turner
cb4d9ff2a8
am 26025f17: am 5b060ef9: Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* commit '26025f179e8e51bce376cf7fdad42bcfdcd58fff':
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:59:21 -07:00
David Turner
1cac4c4787
am b072bc8b: am 052effb8: Merge "Fix an iligal "free"."
...
* commit 'b072bc8bf3ea2c09f27495b5465daeb2cc7e517a':
Fix an iligal "free".
2011-06-28 04:59:19 -07:00
David Turner
4c5e4e1166
am f222e481: am 7c91ae77: Merge "tex 0 is legal."
...
* commit 'f222e481abfcc07bea69a90ce25fea702b5133b4':
tex 0 is legal.
2011-06-28 04:59:17 -07:00
David Turner
b955e57dc3
am ab37200b: am de74b496: Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
...
* commit 'ab37200b39ae24054c428479cbed63596297773d':
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
2011-06-28 04:57:41 -07:00
David Turner
4e9130a6f4
am bcb0c197: Merge "emulator opengl: fixed wrong delete"
...
* commit 'bcb0c197a1d13d2c48ff98dd89f87f15486f1817':
emulator opengl: fixed wrong delete
2011-06-28 04:55:48 -07:00
David Turner
26025f179e
am 5b060ef9: Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* commit '5b060ef926eea0d92f43e1474a5bdbc2dc5794c5':
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:55:46 -07:00
David Turner
b072bc8bf3
am 052effb8: Merge "Fix an iligal "free"."
...
* commit '052effb85f939305f9ff6b743d3447e8e972b75e':
Fix an iligal "free".
2011-06-28 04:55:44 -07:00
David Turner
f222e481ab
am 7c91ae77: Merge "tex 0 is legal."
...
* commit '7c91ae77caa1b277bba162ada95a8a104da9923c':
tex 0 is legal.
2011-06-28 04:55:41 -07:00
David Turner
bcb0c197a1
Merge "emulator opengl: fixed wrong delete"
2011-06-28 04:45:32 -07:00
David Turner
ab37200b39
am de74b496: Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
...
* commit 'de74b496a11b962d9ca3d6188326093b6cfd0c88':
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
2011-06-28 04:45:04 -07:00
David Turner
5b060ef926
Merge changes I1c2d8bc4,I64a63c2e,Ia209f88a,I9e797024,Ic09a5d0e
...
* changes:
emulator opengl: guest/host rendering syncronization.
emulator opengl: initialize new colorbuffers
emulator opengles: Fixed bug in gralloc unregister_buffer
emulator opengles: Fixed a bug in eglChooseConfig implementation.
opengles emulator: Fixed upside-down gl image
2011-06-28 04:44:48 -07:00
David Turner
052effb85f
Merge "Fix an iligal "free"."
2011-06-28 04:39:41 -07:00
David Turner
7c91ae77ca
Merge "tex 0 is legal."
2011-06-28 04:38:57 -07:00
David Turner
de74b496a1
Merge "Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get."
2011-06-28 04:38:18 -07:00
Narayan Kamath
b688761bab
Add sample TTS engine
...
Bug: 4149751
Change-Id: Id8e96d4ec442db46cb97edaeab3ef7c13321ba1f
2011-06-28 09:38:23 +01:00
David 'Digit' Turner
e89c5e20a0
am 5853cce9: am 97c9b03f: am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '5853cce9d0a28ff4ee64909af86dc40e1639e9b8':
ndk: x86: Update android-9 x86 platform files
2011-06-27 14:15:43 -07:00
David 'Digit' Turner
5853cce9d0
am 97c9b03f: am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '97c9b03f62cc7d1102d5f4803bb8ed2b511ed060':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:53:27 -07:00
David 'Digit' Turner
97c9b03f62
am a6896d75: am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit 'a6896d75d1985270a39e12676469a59dcbb096eb':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:47:29 -07:00
David 'Digit' Turner
a6896d75d1
am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"
...
* commit '402b02f8ecbbed55539ee6afd6141bcaad1cc7c3':
ndk: x86: Update android-9 x86 platform files
2011-06-27 10:21:58 -07:00
David 'Digit' Turner
402b02f8ec
Merge "ndk: x86: Update android-9 x86 platform files"
2011-06-27 04:39:55 -07:00
Yochai Shefi Simchon
e02b38778a
Fix an iligal "free".
...
m_map[GL_TEXTURE_COORD_ARRAY] is not an allocated pointer, therefore it shouldn't be freed.
Change-Id: I84e2937c16ddcbb8922cdf270de86732ee966d60
2011-06-25 17:02:33 +03:00
Yochai Shefi Simchon
33cd758244
tex 0 is legal.
...
Change-Id: I99f59aa0aff1986e86e0954bb61924895b9b044f
2011-06-25 17:02:33 +03:00
Yochai Shefi Simchon
72233c6be3
Support GL_(NUM_)COMPRESSED_TEXTURE_FORMATS get.
...
Change-Id: I6adb541649ec83f50f520e27a26814a47359b827
2011-06-25 17:02:33 +03:00