Commit Graph

19549 Commits

Author SHA1 Message Date
Mathias Agopian
367dc0bd5f Updade Surface (ANativeWindow) format based on its buffers format
this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.

Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
2010-10-25 17:08:37 -07:00
Justin Ho
d6a3b3885f am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp

* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
  DO NOT MERGE - Updated ringtone assets for crespo
2010-10-25 16:50:34 -07:00
Justin Ho
a988e8dd60 Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 2010-10-25 16:44:01 -07:00
Gloria Wang
8fcb004423 Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 16:39:12 -07:00
Joe Malin
a9c0f059d3 am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp

* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
  Doc Change: Revert NotePad sample test package
2010-10-25 16:22:46 -07:00
Eric Fischer
98e7c51115 am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE
2010-10-25 16:19:42 -07:00
Joe Malin
df6da5671f Merge "Doc Change: Revert NotePad sample test package" into gingerbread 2010-10-25 16:19:18 -07:00
Eric Fischer
e8eb0f2551 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Gloria Wang
172abbb311 resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
2010-10-25 16:11:18 -07:00
Mathias Agopian
639716736f fix eglChooseConfig() for special attributes.
affects software renderer (emu) only.

per EGL spec:
  If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT,
  EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are speciļ¬ed
  in attrib list, then they are ignored

Change-Id: I3d5214ce896986da2f11d2eb1889afc41731eaa6
2010-10-25 15:51:24 -07:00
Jean-Baptiste Queru
5ed12f734c Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked" 2010-10-25 15:32:12 -07:00
Jeff Hamilton
6c51bba99b am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp

* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
  Add a RHS status bar slot for NFC.
2010-10-25 14:49:07 -07:00
Jeff Hamilton
0da22df98e Merge "Add a RHS status bar slot for NFC." into gingerbread 2010-10-25 14:46:45 -07:00
Mike Lockwood
aa4a1546de am 8c32bddf: Merge "GPS: Disable verbose logging" into gingerbread
Merge commit '8c32bddfac259543f4ed87341fce42bc5ed60506' into gingerbread-plus-aosp

* commit '8c32bddfac259543f4ed87341fce42bc5ed60506':
  GPS: Disable verbose logging
2010-10-25 13:55:27 -07:00
Mike Lockwood
c0c9d38170 Merge "GPS: Disable verbose logging" into gingerbread 2010-10-25 13:49:13 -07:00
Mathias Agopian
a7a8f05d8c am 457bed2b: Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread
Merge commit '457bed2bc6561dd67429dde238453fee8602fa9b' into gingerbread-plus-aosp

* commit '457bed2bc6561dd67429dde238453fee8602fa9b':
  fix [3123221] Video sticks playing back upside down following orientation switch
2010-10-25 13:38:15 -07:00
Mathias Agopian
46135ee9a3 am ce4d36ad: Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread
Merge commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e' into gingerbread-plus-aosp

* commit 'ce4d36ad729f83253d4c5ec9906148f45cc00f8e':
  fix [3118445] Transform * Transform does not work as expected
2010-10-25 13:38:11 -07:00
Mathias Agopian
38e5c8ef89 Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 2010-10-25 13:31:11 -07:00
Mathias Agopian
24b59dd299 Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 2010-10-25 13:31:03 -07:00
Gloria Wang
5a03d37295 Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback" 2010-10-25 12:23:35 -07:00
Adam Powell
0b3b01a609 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
2010-10-25 12:07:51 -07:00
Adam Powell
6ec561d0d9 Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 2010-10-25 11:43:03 -07:00
Scott Main
e1da11ce8c am abb50f15: Merge "docs: fix a couple api links" into gingerbread
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links
2010-10-25 11:27:55 -07:00
Scott Main
9623583194 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00
Nick Pelly
a6194e9111 am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Merge commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e' into gingerbread-plus-aosp

* commit '79e76f52a6235c01aec64a978e33b89cbb9e1c2e':
  Fixed NdefTag parcelable conversion methods.
2010-10-25 09:09:37 -07:00
Wu-cheng Li
98da7c8078 am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp

* commit '89821204379816f6bee6902c4f132c014700c3b0':
  Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
2010-10-25 09:09:26 -07:00
Nick Pelly
3fa1a714a9 Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 2010-10-25 08:58:00 -07:00
Wu-cheng Li
e22a282c45 Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 2010-10-25 08:55:54 -07:00
Nick Pelly
bbefc88e86 am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
Merge commit '145550a00ea59ff20133acc95315e463628e16db' into gingerbread-plus-aosp

* commit '145550a00ea59ff20133acc95315e463628e16db':
  Document getPollBytes() and getActivationBytes().
2010-10-24 22:11:52 -07:00
Nick Pelly
58b8f2ff51 Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 2010-10-24 22:06:15 -07:00
Mathias Agopian
d3caac954c fix [3123221] Video sticks playing back upside down following orientation switch
the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.

Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
2010-10-24 19:03:58 -07:00
Dianne Hackborn
a207bdf4bc am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread
Merge commit '236568999411214ef440cabc6d12e3bf5f19d8f4' into gingerbread-plus-aosp

* commit '236568999411214ef440cabc6d12e3bf5f19d8f4':
  Fix issue #3126018: No way to specify NativeActivity's native method
2010-10-24 18:38:11 -07:00
Dianne Hackborn
7dd80694dd Merge "Fix issue #3126018: No way to specify NativeActivity's native method" into gingerbread 2010-10-24 18:33:36 -07:00
Mathias Agopian
0694d0f3b3 fix [3118445] Transform * Transform does not work as expected
The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.

We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.

Also added a simple test for Transform.

Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
2010-10-24 14:53:05 -07:00
Jeff Brown
b7efb89ee2 am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp

* commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
  Add unit tests for native input and fix bugs identified.
2010-10-24 14:31:41 -07:00
Jeff Brown
f35c873501 Merge "Add unit tests for native input and fix bugs identified." into gingerbread 2010-10-24 14:18:19 -07:00
Joe Onorato
61d622ea20 am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too.
Merge commit '60607a9012c9b7d39bef8fcf0284772f1b061efc' into gingerbread-plus-aosp

* commit '60607a9012c9b7d39bef8fcf0284772f1b061efc':
  Make sure that when the screen is off, we don't try to turn the buttons on too.
2010-10-24 09:25:49 -07:00
Jean-Baptiste Queru
b20c2cbe9b Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp 2010-10-24 05:26:09 -07:00
Jeff Brown
3c3cc62e24 Add unit tests for native input and fix bugs identified.
Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.

Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP.  In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.

Improved motion event validation to check for duplicate pointer ids.

Added an input source constant that was missing from the NDK api but
defined in the framework api.

Added a timestamp when reporting added/removed devices in EventHub.

Bug: 3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
2010-10-23 03:52:57 -07:00
Eric Laurent
7cb9185d7c am b6a2256e: Merge "Fix issue 3126094." into gingerbread
Merge commit 'b6a2256e5461160a89d077b761d3253d95ce869f' into gingerbread-plus-aosp

* commit 'b6a2256e5461160a89d077b761d3253d95ce869f':
  Fix issue 3126094.
2010-10-22 18:41:29 -07:00
Eric Laurent
48a862ef5f Merge "Fix issue 3126094." into gingerbread 2010-10-22 18:37:09 -07:00
Eric Fischer
3f965b9ede am ecae6e06: Merge "Import translations for status bar." into gingerbread
Merge commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed' into gingerbread-plus-aosp

* commit 'ecae6e06a3bed9b6ab108629e4180fe55f4726ed':
  Import translations for status bar.
2010-10-22 18:21:14 -07:00
Eric Rowe
c9ce2b21d7 am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
Merge commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82' into gingerbread-plus-aosp

* commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82':
  Change disable timeout for BT disable stress test
2010-10-22 18:21:09 -07:00
Nick Pelly
c6c9185661 am 07f3bee2: Push Tag/NdefTag implementation details into the service.
Merge commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569' into gingerbread-plus-aosp

* commit '07f3bee2db8b6e93ebbf7222676bd9f468e85569':
  Push Tag/NdefTag implementation details into the service.
2010-10-22 18:20:52 -07:00
Eric Fischer
518ee6fe95 Merge "Import translations for status bar." into gingerbread 2010-10-22 17:14:36 -07:00
Eric Rowe
4f6f494562 Merge "Change disable timeout for BT disable stress test" into gingerbread 2010-10-22 17:14:12 -07:00
Eric Fischer
04b7b009c9 am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:08:27 -07:00
Eric Fischer
2e960b21a8 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:06:38 -07:00
Eric Fischer
b0dedf53ca am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread 2010-10-22 16:01:34 -07:00
Eric Fischer
372f65ccf6 Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread 2010-10-22 15:59:42 -07:00