Jaikumar Ganesh
c0cd516cde
am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
...
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
2011-01-28 18:45:14 -08:00
John Reck
3089e2284a
am 398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
...
* commit '398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
2011-01-28 18:44:57 -08:00
Jeff Hamilton
1dd3301c8c
resolved conflicts for merge of dc54a8c7 to honeycomb-merge
...
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
2011-01-28 20:41:42 -06:00
Mathias Agopian
779160c4ea
Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
2011-01-28 18:38:58 -08:00
Mathias Agopian
3cc2677efc
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
...
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.
Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
2011-01-28 18:23:24 -08:00
Jamie Gennis
68f9127e88
Reset ANativeWindow crop on buffer geometry changes.
...
This changes the ANativeWindow API and the two implementations to reset
the window's crop rectangle to be uncropped when the window's buffer
geometry is changed.
Bug: 3359604
Change-Id: I64283dc8382ae687787ec0bebe6a5d5b4a0dcd6b
2011-01-28 18:21:54 -08:00
Jason Sams
56a764c39c
Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
2011-01-28 17:56:28 -08:00
Jason Sams
c5b1fe9236
Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
2011-01-28 17:56:09 -08:00
Jean-Michel Trivi
58ac4b4923
am a314f32b: (-s ours) Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
...
* commit 'a314f32ba92d46687aef9f420eb61491eff485cf':
Bug 3365937 notify TTS initialization listener of binding errors
2011-01-28 17:37:12 -08:00
Xavier Ducrohet
0f962411f8
Merge "LayoutLib: update with Pair API." into honeycomb
2011-01-28 17:21:57 -08:00
Joe Onorato
a618e56e61
Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb
2011-01-28 16:38:01 -08:00
Dianne Hackborn
8bd4cefdb4
Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
2011-01-28 16:34:02 -08:00
Jim Miller
11ae43006e
Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb
2011-01-28 16:21:38 -08:00
Chet Haase
bb58b9cc90
Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
2011-01-28 16:19:32 -08:00
Eric Fischer
a7442c9587
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-28 15:09:16 -08:00
Justin Ho
31db9b8551
Merge "Correct font size for notifications & control panel." into honeycomb
2011-01-28 15:02:55 -08:00
Brian Muramatsu
12ef5792f0
Merge "Fix TextUtils#commaEllipsize" into honeycomb
2011-01-28 14:51:10 -08:00
Romain Guy
3845b92378
Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
2011-01-28 14:17:45 -08:00
Jamie Gennis
155c93ad47
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
2011-01-28 14:12:57 -08:00
Eric Fischer
bb3356d637
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-28 14:10:43 -08:00
Gilles Debunne
2948bb3f5f
Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb
2011-01-28 14:07:12 -08:00
Adam Powell
7791f904da
Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
2011-01-28 13:58:28 -08:00
Joe Onorato
ee37f4d420
Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
...
* changes:
Make keyguard also ask to turn the back button off, now that it is controlled separately.
Allow independent control of the back and the other navigation buttons.
Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:40:45 -08:00
Joe Onorato
311e33ddd1
Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
2011-01-28 13:40:28 -08:00
Dianne Hackborn
e40389171f
Merge "Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader" into honeycomb
2011-01-28 12:44:52 -08:00
Xavier Ducrohet
2b63b8306b
Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
2011-01-28 12:38:40 -08:00
Daniel Sandler
ea0c499624
Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
2011-01-28 12:18:11 -08:00
Jamie Gennis
749172269a
Quiet the SurfaceFlingerClient dequeueBuffer error.
...
This is a temporary WAR for the case where dequeueBuffer is called when
all the buffers owned by a SurfaceTexture are not available - either
they're the current texture buffer or the next one. Currently, an error
is returned in that case, and this change just prevents that error from
being logged. In the future this will be fixed to not return an error
in that case.
Bug: 3356050
Change-Id: Ic6cc304881a63ce134cfd0bcb4265e3e3fa94b6a
2011-01-28 12:08:18 -08:00
Dirk Dougherty
11057a96fd
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
2011-01-28 11:57:42 -08:00
Andreas Huber
b7ee5074dd
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb
2011-01-28 11:49:03 -08:00
Daniel Sandler
fab00f6920
Merge "Allow taps to once again penetrate the darkness." into honeycomb
2011-01-28 11:21:27 -08:00
Gilles Debunne
288e4320da
Merge "Fix for an IOOBoundsException in Paint." into honeycomb
2011-01-28 10:58:53 -08:00
Jamie Gennis
732c3a087c
Merge "Add docs about threading to SurfaceTexture." into honeycomb
2011-01-28 10:42:53 -08:00
Leon Scroggins
d554549b27
Merge "Only send a direction key if we are not in touch mode." into honeycomb
2011-01-28 10:32:35 -08:00
Chet Haase
dc5f2c714f
Merge "Fix artifact with clipped webview content" into honeycomb
2011-01-28 10:16:54 -08:00
Robert Greenwalt
8e70e7cd29
Merge "Fix data network type notifications." into honeycomb
2011-01-28 09:48:31 -08:00
Andreas Huber
2f313aa982
Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
2011-01-28 09:38:50 -08:00
Ben Murdoch
4613570b51
Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
2011-01-28 02:27:38 -08:00
Dianne Hackborn
a2ba76d444
Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
2011-01-27 22:48:58 -08:00
Dianne Hackborn
a3980da2d0
Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
2011-01-27 22:47:50 -08:00
Dianne Hackborn
0891204682
Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
2011-01-27 22:46:44 -08:00
Romain Guy
f930d5de48
Merge "Add more debug info for profiling." into honeycomb
2011-01-27 22:30:57 -08:00
Dianne Hackborn
11e0746577
Fix issue #3392073 : At times soft keyboard comes up in...
...
...gallery while attaching picture to gmail message
In various places we could block switching the IME target incorrectly.
Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa
2011-01-27 21:56:33 -08:00
Jason Sams
61486c0980
Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb
2011-01-27 21:24:00 -08:00
Eric Laurent
3e04730f32
am c5694ebd: (-s ours) Merge "do not merge - Fix issue 3371096." into gingerbread
...
* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
do not merge - Fix issue 3371096.
2011-01-27 21:21:04 -08:00
Adam Cohen
460529bb93
Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
2011-01-27 20:04:21 -08:00
satok
540494935d
Merge "Update InputMethodPanel when locale was changed." into honeycomb
2011-01-27 20:00:43 -08:00
Dianne Hackborn
777b260dfc
am 11576102: (-s ours) Fix issue #3373438 : Update GBMR versions
...
* commit '11576102a9794ef964a08bc372dc09803f58997a':
Fix issue #3373438 : Update GBMR versions
2011-01-27 19:57:58 -08:00
Dave Sparks
3ce5ba094f
am 65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
...
* commit '65d39eeb9b032e5507a01daa25afff62b29bffe4':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
2011-01-27 19:49:59 -08:00
Mathias Agopian
3d24c3d2c8
am 822d4ce6: Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
...
* commit '822d4ce61687d386f9630b33113c6193257d6878':
fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
2011-01-27 19:49:40 -08:00