Commit Graph

23739 Commits

Author SHA1 Message Date
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
Adam Powell
6a86149250 Merge "Fix bug 3005359 - onListItemClick and ActionMode conflict" 2010-10-24 16:57:21 -07:00
Adam Cohen
a1ef8f94a6 Merge "Fixing the case of less than or equal to 5 items in StackView" 2010-10-24 15:35:23 -07:00
Jeff Brown
5e871b47ef Add test stubs for newly added methods.
Change-Id: I44139adebbbed1358f613fbcbfcddac6617ef5bd
2010-10-24 15:25:53 -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
bc9f053156 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
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
Joe Onorato
8e1662117e Merge "make the back (previous track) button into a cancel button." 2010-10-24 14:31:22 -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
Adam Powell
d182728c25 Merge "Fix list dividers for holo" 2010-10-24 13:18:27 -07:00
Chet Haase
ccbef13bc6 Merge "Fix Caches singleton to avoid resource leaks" 2010-10-24 12:35:07 -07:00
Joe Onorato
337fbf2450 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
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
dfce6a1e49 Ignore b04e3940 from gingerbread-plus-aosp - already in master
Change-Id: Iad2179aa6cf6214ba32239774846bad676f6b976
2010-10-24 09:13:44 -07:00
Jean-Baptiste Queru
fce8eb5699 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
b20c2cbe9b Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp 2010-10-24 05:26:09 -07:00
Romain Guy
3de3145a37 Merge "Fix rendering issue with layers." 2010-10-23 23:10:35 -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
126e50a966 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
638ba3bc39 Merge "Fix error recovery when a drag can't be started" 2010-10-22 19:20:24 -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
2cab4ec4a6 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
27538f6540 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
85ac552f10 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
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
Adam Powell
421e60cff4 Merge "Fix bug 3105695 - Action modes in dialogs or other small windows" 2010-10-22 17:52:01 -07:00
Dianne Hackborn
bfd5a120e1 Merge "Implement issue #3116702: New manifest tags for supported screen sizes" 2010-10-22 17:16:12 -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
0cbf3fb6ae 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
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
aea4decb80 am 26dc88af: am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread 2010-10-22 16:04:33 -07:00
Brad Fitzpatrick
fe731290d3 Merge "Expose (internally only) the number of animations currently running." 2010-10-22 16:01:55 -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
Xavier Ducrohet
d119af7703 Merge "Layoutlib_Create: Fix order of class adapters." 2010-10-22 15:42:40 -07:00
Xavier Ducrohet
abbbacd8d7 Merge "Layoutlib_create: fix binary name of delegate methods." 2010-10-22 15:42:26 -07:00
Shimeng (Simon) Wang
5a4fe41b22 Merge "Let double tap reflow text." 2010-10-22 15:26:03 -07:00
Shimeng (Simon) Wang
5082b042f5 Merge "Ignore viewport viewScale in fixed viewport mode." 2010-10-22 15:25:00 -07:00
Gilles Debunne
6e88cac900 Merge "Fix for 3124993. Crash in Browser on long press." 2010-10-22 14:51:15 -07:00
Dianne Hackborn
c01d0f9bb8 resolved conflicts for merge of 9c7489f8 to master
Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
2010-10-22 14:35:09 -07:00
James Dong
c982f887c9 Merge "OMX extension to support storing meta data in video input buffers during recording" 2010-10-22 14:07:41 -07:00
Dianne Hackborn
eeb96f63d2 am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:03:08 -07:00
Xavier Ducrohet
2cc1c8e1db Merge "Remove dependency on ASM util classes." 2010-10-22 14:03:07 -07:00
Dianne Hackborn
91d5ae02fd Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread 2010-10-22 14:01:25 -07:00
Xavier Ducrohet
a181008a8a am 2051a1be: am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api" 2010-10-22 13:41:08 -07:00