34857 Commits

Author SHA1 Message Date
Adam Powell
aa6110d840 Merge "Fix bug 3005359 - onListItemClick and ActionMode conflict" 2010-10-24 16:57:21 -07:00
Adam Powell
bf5f2b3ffe Fix bug 3005359 - onListItemClick and ActionMode conflict
CHOICE_MODE_MULTIPLE_MODAL should not dispatch item click events
when in selection mode.

Change-Id: I664fdd01e5c5691ea6ad071bc36a9497fd97ce4d
2010-10-24 16:47:34 -07:00
Adam Cohen
f333d22e4e Merge "Fixing the case of less than or equal to 5 items in StackView" 2010-10-24 15:35:23 -07:00
Jeff Brown
7631cbbed4 Add test stubs for newly added methods.
Change-Id: I44139adebbbed1358f613fbcbfcddac6617ef5bd
2010-10-24 15:25:53 -07:00
Jeff Brown
3ae4ac8538 am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '2ef36763700eff5679d6012e7f078c57f1a4c465'

* commit '2ef36763700eff5679d6012e7f078c57f1a4c465':
  Add unit tests for native input and fix bugs identified.
2010-10-24 14:36:23 -07:00
Jeff Brown
2ef3676370 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
Joe Onorato
4761b176ed Merge "make the back (previous track) button into a cancel button." 2010-10-24 14:31:22 -07:00
Joe Onorato
bd5dba3571 make the back (previous track) button into a cancel button.
Change-Id: Iab93a7d8bd722536fcc5a12ed3274bda3e92aaf6
2010-10-24 14:29:01 -07:00
Jeff Brown
860c2df413 Merge "Add unit tests for native input and fix bugs identified." into gingerbread 2010-10-24 14:18:19 -07:00
Adam Cohen
96d8d56302 Fixing the case of less than or equal to 5 items in StackView
Change-Id: I9226fe8343902e06e2f4b04837e232f1744786a8
2010-10-24 14:15:14 -07:00
Adam Powell
a8cbdb9a9c Merge "Fix list dividers for holo" 2010-10-24 13:18:27 -07:00
Adam Powell
f876cc72c0 Fix list dividers for holo
Change-Id: I7d5a8e735887d3c278dd8a559d9c85fb26f4eba5
2010-10-24 13:17:15 -07:00
Chet Haase
715a89ebbf Merge "Fix Caches singleton to avoid resource leaks" 2010-10-24 12:35:07 -07:00
Chet Haase
dd78ccacff Fix Caches singleton to avoid resource leaks
The declaration of Singleton objects must be in CPP files (not header
files) to avoid creating separate instances of what is supposedly a
single object.

Change-Id: Ie903384824a458b5572f3ce5b6cfb359c18a9c44
2010-10-24 12:27:22 -07:00
Adam Powell
50ae1dc3a4 New assets for lists and buttons
Change-Id: I289f2326cb9e21df963edfd7a6e8f951bdead732
2010-10-24 12:08:22 -07:00
Joe Onorato
a2a764b9fa am b34fe2f0: am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too.
Merge commit 'b34fe2f0258eb1ed512b682206b7fe65116f1dbd'

* commit 'b34fe2f0258eb1ed512b682206b7fe65116f1dbd':
  Make sure that when the screen is off, we don't try to turn the buttons on too.
2010-10-24 09:30:05 -07:00
Joe Onorato
b34fe2f025 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
33ac37fc5e Ignore b04e3940 from gingerbread-plus-aosp - already in master
Change-Id: Iad2179aa6cf6214ba32239774846bad676f6b976
2010-10-24 09:13:44 -07:00
Mike Lockwood
b04e3940d1 Fixes for simulator build on lucid
strchr and strrchr now return const char* instead of char*

Change-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358
2010-10-24 08:52:08 -07:00
Jean-Baptiste Queru
045002e0fc am c6d813b0: Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp
Merge commit 'c6d813b0c5c21ab4e8ff920d181c5a29b7bb9f22'

* commit 'c6d813b0c5c21ab4e8ff920d181c5a29b7bb9f22':
  Introduce a list of all the audio files
2010-10-24 05:29:10 -07:00
Jean-Baptiste Queru
c6d813b0c5 Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp 2010-10-24 05:26:09 -07:00
Romain Guy
9c937f3687 Merge "Fix rendering issue with layers." 2010-10-23 23:10:35 -07:00
Shih-wei Liao
0175e01f54 Enable optimized bitcode that is also jitted faster.
Change-Id: I08832cfaf4e8465c16b445eeb1b82f72d874d0ef
2010-10-23 22:12:29 -07:00
Joe Onorato
60607a9012 Make sure that when the screen is off, we don't try to turn the buttons on too.
Bug: 3117801
Change-Id: I763f114a2b0426660d29bbda04ea7db12c1137e8
2010-10-23 14:49:57 -07:00
Jeff Brown
c3db858de9 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
4de82c7885 am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread
Merge commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860'

* commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860':
  Fix issue 3126094.
2010-10-22 22:47:52 -07:00
Chris Tate
9d21067231 Merge "Fix error recovery when a drag can't be started" 2010-10-22 19:20:24 -07:00
Chris Tate
ef70a07753 Fix error recovery when a drag can't be started
Also make sure to properly dispose *both* ends of the drag input
channel when we're done.  That was being tidied up after, but was
also making the system work harder and was provoking a bit of
debug logging.

Change-Id: I1ff3100bc4c441f1609c57242864d5744ff1aaa2
2010-10-22 19:12:52 -07:00
Jean-Baptiste Queru
38655c0088 Introduce a list of all the audio files
Change-Id: Id52870e4d491bf074d5aa6f77d749397710ff316
2010-10-22 18:56:52 -07:00
Eric Laurent
5a9d273718 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
b6a2256e54 Merge "Fix issue 3126094." into gingerbread 2010-10-22 18:37:09 -07:00
Eric Fischer
072fabc0e5 am d3f5bf5a: am ecae6e06: Merge "Import translations for status bar." into gingerbread
Merge commit 'd3f5bf5aac395cdc7c2faa173141b69adea6e274'

* commit 'd3f5bf5aac395cdc7c2faa173141b69adea6e274':
  Import translations for status bar.
2010-10-22 18:31:38 -07:00
Eric Rowe
5dcf000117 am 288f1373: am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
Merge commit '288f13730e6535fb36581781196a55a6f2d198d6'

* commit '288f13730e6535fb36581781196a55a6f2d198d6':
  Change disable timeout for BT disable stress test
2010-10-22 18:31:31 -07:00
Nick Pelly
1d952ff85e am f5b5d177: am 07f3bee2: Push Tag/NdefTag implementation details into the service.
Merge commit 'f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59'

* commit 'f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59':
  Push Tag/NdefTag implementation details into the service.
2010-10-22 18:31:06 -07:00
Eric Fischer
d3f5bf5aac 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
288f13730e 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
f5b5d177a9 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 Laurent
cc02ac54ac Fix issue 3126094.
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.

Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
2010-10-22 18:08:13 -07:00
Adam Powell
a139f102d8 Merge "Fix bug 3105695 - Action modes in dialogs or other small windows" 2010-10-22 17:52:01 -07:00
Romain Guy
ae88e5e8e9 Fix rendering issue with layers.
A change was made earlier in the renderer to not snap the current clip rect
on every clip operation. The clip rect must not be snapped to pixel boundaries
before being used for pixel precision operations. Some operations were doing
this correctly, others were not. For instance, a layer was always created by
rounding to the correct pixels, but composing a layer was done with a non
rounded clip, thus resulting in slightly odd behaviors.

Change-Id: I31c2cf0a343450470bcd449c3f13fe37648b9c7c
2010-10-22 17:49:18 -07:00
Adam Powell
85446e95af Fix bug 3105695 - Action modes in dialogs or other small windows
Overlay action modes now show in their own windows aligned to the top
of the screen.

Change-Id: I81600bbd1bcaeb59fdcf0a959bd35f82165baa2c
2010-10-22 17:45:31 -07:00
Dianne Hackborn
a7a44d47cb Merge "Implement issue #3116702: New manifest tags for supported screen sizes" 2010-10-22 17:16:12 -07:00
Eric Fischer
ecae6e06a3 Merge "Import translations for status bar." into gingerbread 2010-10-22 17:14:36 -07:00
Eric Rowe
8de43ab5ba Merge "Change disable timeout for BT disable stress test" into gingerbread 2010-10-22 17:14:12 -07:00
Eric Fischer
4aa82a7b7a Import translations for status bar.
Change-Id: I5f40e9c507530fb4110da711e54465c2ae920a94
2010-10-22 16:49:14 -07:00
Eric Rowe
867568314d Change disable timeout for BT disable stress test
Bug: b/3125900
Change-Id: Ie1f599f1c418fc40c29debd1401297441a2a9db3
2010-10-22 16:34:33 -07:00
Nick Pelly
07f3bee2db Push Tag/NdefTag implementation details into the service.
Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.

This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.

There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.

Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).

Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 16:29:43 -07:00
Dianne Hackborn
a0b46c9c44 Implement issue #3116702: New manifest tags for supported screen sizes
Merged from GB.

Change-Id: I94730b54bcacd083f77708e84c35f4932a7b9d2e
2010-10-22 16:18:43 -07:00
Eric Fischer
70e4c0f1b6 am d13f5f4f: (-s ours) am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:10:25 -07:00
Eric Fischer
d13f5f4fea am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:08:27 -07:00