Mike Lockwood
4a7b65e0d5
GPS: Disable verbose logging
...
BUG: 3127049
Change-Id: I9efd9eb7ff69724b133f3b70c52e173f49ddfbc5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-25 16:35:55 -04:00
Shimeng (Simon) Wang
346f97f82f
Fix the viewport height to view height when title bar is visible.
...
issue: 3097787
Change-Id: Ie685a94262cecd94f32dbb94991fea76ceb43b94
2010-10-25 13:33:31 -07:00
Mathias Agopian
457bed2bc6
Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread
2010-10-25 13:31:11 -07:00
Mathias Agopian
ce4d36ad72
Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread
2010-10-25 13:31:03 -07:00
Andreas Huber
67ef3179db
Merge "We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets."
2010-10-25 13:13:04 -07:00
Daniel Sandler
8304da460f
Swipe up to open the settings panel. Tap anywhere to close.
...
This should help reduce false hits on the clock when typing
on an on-screen keyboard.
Change-Id: I3afab88c800873d1801b16ac79ffa3e7ddd42949
2010-10-25 15:53:25 -04:00
Andreas Huber
cf74754f9f
We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets.
...
Change-Id: I02a9b4af929601c899f04cee9864d0dd0716de62
2010-10-25 12:48:00 -07:00
Gloria Wang
9084631dba
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
Gloria Wang
d5770917a5
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
Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
2010-10-25 12:16:56 -07:00
Adam Powell
de0f98ea99
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
760a5b7b8f
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
6db925001e
Merge "increase sql statement printed in finalier warnings from 100 to 1000"
2010-10-25 12:08:46 -07:00
Vasu Nori
ba42fb3a25
Merge "when printing cache-full warning, print the sql statements in cache"
2010-10-25 12:07:57 -07:00
Adam Powell
67bb674196
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
Marco Nelissen
a6face4d40
Plumb KEYCODE_MEDIA_PAUSE and KEYCODE_MEDIA_PLAY up through the framework.
...
b/2764237
Change-Id: I9a20974fa0b7527230258f7d0bf829a031673a9d
2010-10-25 12:07:07 -07:00
Daniel Sandler
23f2243088
Merge "Fix drags from the shirt pocket"
2010-10-25 12:00:40 -07:00
Vasu Nori
b73cf1cc39
increase sql statement printed in finalier warnings from 100 to 1000
...
100 for sql statement seems too small for some apps (gmail is one example)
Change-Id: I4d29bffc0da5a854ca650d083b81df8769b35b77
2010-10-25 11:55:56 -07:00
Vasu Nori
74fb2685e2
when printing cache-full warning, print the sql statements in cache
...
this should help debug developers in idetifying the sql statements
taking up cache slots
Change-Id: Ibc0140c273adc5c8d58ab359d2c4d4ce14b6b63b
2010-10-25 11:50:56 -07:00
Adam Powell
17efcde161
Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
2010-10-25 11:43:03 -07:00
Scott Main
dc28be1095
resolved conflicts for merge of 177b05d6 to master
...
Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
2010-10-25 11:37:08 -07:00
Scott Main
177b05d614
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
abb50f1528
Merge "docs: fix a couple api links" into gingerbread
2010-10-25 11:18:28 -07:00
Adam Powell
b9b8f7b99b
DO NOT MERGE Fix bug 3124899 - timeout in CTS test
...
ExpandableListViewBasicTest
A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.
Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
2010-10-25 11:12:41 -07:00
Jaikumar Ganesh
e775b3daab
Expose Vendor Specific Headset Event Intent.
...
The Bluetooth Headset spec doesn't cover all cases.
For example, there is nothing defined to show the battery status of
the headset on the phone. This intent allows 3rd party applications
to communicate effectively with vendor headsets. For example, Plantronics
has an app for Android headsets and when used with Plantronics
headsets, they will be able to use extra information from the headset.
Change-Id: Ib997327103cbbe57d64c52ba27f74162b6769798
2010-10-25 11:07:58 -07:00
Adam Powell
f0a896b353
Merge "Fix ratingBarStyleSmall style in Holo theme."
2010-10-25 10:28:53 -07:00
Nick Pelly
98ce4a43a4
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
8262c7856e
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
4c8fda62e1
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
b877a54a27
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
79e76f52a6
Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
2010-10-25 08:58:00 -07:00
Mathew Inwood
3986b4c2ad
Fix ratingBarStyleSmall style in Holo theme.
...
Bug: 3123746
Change-Id: Icbfd5e2fcae7c1668e243c1b03a62ab31f42126b
2010-10-25 16:56:06 +01:00
Wu-cheng Li
8982120437
Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
2010-10-25 08:55:54 -07:00
Sylvain Fonteneau
e2e4ea9ea8
Fixed NdefTag parcelable conversion methods.
...
Also removed call to obsolete openTagConnection() method which was crashing.
Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-25 08:55:36 -07:00
Leon Scroggins
a8dc004aed
Merge "Provide strings for text selection options in WebView."
2010-10-25 06:25:24 -07:00
Steve Block
16b7a1b967
Merge "Add a JNI method to determine which HTTP stack is in use"
2010-10-25 04:44:41 -07:00
Wu-cheng Li
d55f7e56b9
Mirror the camera preview if the camera is front-facing.
...
bug:3095272
Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
2010-10-25 15:02:44 +08:00
Wu-cheng Li
994c02bbfe
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
...
Now overlay does flip before rotation.
bug:3114236
Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
2010-10-25 14:56:22 +08:00
Nick Pelly
197eee425c
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
d6abaf326b
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
145550a00e
Merge "Document getPollBytes() and getActivationBytes()." into gingerbread
2010-10-24 22:06:15 -07:00
Nick Pelly
416d72f4b6
Document getPollBytes() and getActivationBytes().
...
No code change.
Change-Id: Ideb427b2684b9f9296abefb7c97eabc52db73ee0
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-24 22:03:04 -07:00
Adam Powell
b3b113a8be
Merge "Fix bug 2964954 - Lists blow up if their adapter changes while detached."
2010-10-24 19:31:23 -07:00
Adam Powell
6a0d09944b
Fix bug 2964954 - Lists blow up if their adapter changes while detached.
...
If a list adapter's content changes while the ListView is detached
from a window, the data change is not registered and the next
layoutChildren call causes the ListView to detect a bad change that
the adapter did not notify ListView about. Any time a ListView becomes
attached to a window, has a valid adapter, and no attached data set
observer, treat it as a data set changed event.
Change-Id: Ic00c05a1a0d063399dc78d5d877e3d5f9b1bee16
2010-10-24 19:30:18 -07:00
Mathias Agopian
c57b15c9c8
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
6ab84eeb0f
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
c2f78020d3
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
2365689994
Merge "Fix issue #3126018 : No way to specify NativeActivity's native method" into gingerbread
2010-10-24 18:33:36 -07:00
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