ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
23,563 Commits 2 Branches 0 Tags 54 MiB
d3abf6a4aa
Commit Graph

23563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
d3abf6a4aa am 67bb6741: (-s ours) am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 
Merge commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e'

* commit '67bb6741965c0b9f3bf6b4caf2647efc564e287e':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
 2010-10-25 12:13:56 -07:00
Marco Nelissen
92d5f0b191 Merge "Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework. b/2764237" 2010-10-25 12:10:01 -07:00
Vasu Nori
f11bd21294 Merge "increase sql statement printed in finalier warnings from 100 to 1000" 2010-10-25 12:08:46 -07:00
Vasu Nori
851876694b Merge "when printing cache-full warning, print the sql statements in cache" 2010-10-25 12:07:57 -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
Daniel Sandler
dc254d2d08 Merge "Fix drags from the shirt pocket" 2010-10-25 12:00:40 -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
909e507227 resolved conflicts for merge of 177b05d6 to master 
Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
 2010-10-25 11:37:08 -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
Adam Powell
71ff5d15b9 Merge "Fix ratingBarStyleSmall style in Holo theme." 2010-10-25 10:28:53 -07:00
Nick Pelly
894549908c am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 
Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf'

* commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf':
  Fixed NdefTag parcelable conversion methods.
 2010-10-25 09:24:41 -07:00
Wu-cheng Li
c51ff97014 am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 
Merge commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5'

* commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5':
  Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
 2010-10-25 09:24:33 -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
Leon Scroggins
b229afdc21 Merge "Provide strings for text selection options in WebView." 2010-10-25 06:25:24 -07:00
Steve Block
e51388dfbd Merge "Add a JNI method to determine which HTTP stack is in use" 2010-10-25 04:44:41 -07:00
Nick Pelly
20679c3398 am d6abaf32: am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 
Merge commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69'

* commit 'd6abaf326ba4e0ff342cf28a828b75a334beba69':
  Document getPollBytes() and getActivationBytes().
 2010-10-24 22:16:39 -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
Adam Powell
e22e25fe80 Merge "Fix bug 2964954 - Lists blow up if their adapter changes while detached." 2010-10-24 19:31:23 -07:00
Dianne Hackborn
7838968782 am c2f78020: am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread 
Merge commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e'

* commit 'c2f78020d3887539fc90230d96465e4b1dc84d8e':
  Fix issue #3126018: No way to specify NativeActivity's native method
 2010-10-24 18:42:12 -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
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
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