Justin Ho
59968ec09b
Merge "Reversal of indeterminate progressbar"
2011-09-20 09:57:48 -07:00
Chih-Chung Chang
2c685cfd2f
Merge "Fix 5224359: Add width and height to media store."
2011-09-20 09:23:34 -07:00
Daniel Sandler
8ecad74cfa
Merge "Fix disappearing nav icons."
2011-09-20 07:47:45 -07:00
Daniel Sandler
433cef7ed2
Merge "Stop clobbering the systemUiVisibility on navbar touch."
2011-09-20 07:47:40 -07:00
The Android Open Source Project
35cfc07d4a
Reconcile with ics-factoryrom-release
...
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
2011-09-20 07:43:10 -07:00
The Android Automerger
52040fe26c
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 06:28:15 -07:00
Jeff Sharkey
5b59681814
am 88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom
...
* commit '88b18eb8c2034e9de35482cc737ef8d608d55867':
Upload correct txPackets count.
2011-09-19 21:44:00 -07:00
Jeff Sharkey
f430f33281
Merge "Upload correct txPackets count." into ics-factoryrom
2011-09-19 21:42:13 -07:00
James Dong
ca550f8b2c
am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
...
* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
2011-09-19 20:09:00 -07:00
James Dong
8e97a40c42
Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
2011-09-19 20:06:52 -07:00
Peter Ng
26f58b5f99
Merge "Keyguard padding fixes"
2011-09-19 19:01:58 -07:00
Irfan Sheriff
0e783d2cb5
am 3b6377b1: Merge "Add supplication shut down recovery" into ics-factoryrom
...
* commit '3b6377b120bb507f93a8f1e7e25bc026de764dd6':
Add supplication shut down recovery
2011-09-19 19:01:17 -07:00
Irfan Sheriff
66e5adf085
Merge "Add supplication shut down recovery" into ics-factoryrom
2011-09-19 18:58:58 -07:00
Justin Ho
560d03170c
Merge "Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug: 5200575"
2011-09-19 18:06:13 -07:00
Justin Ho
995a1cbc21
am 54ecf3c6: Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom
...
* commit '54ecf3c636dda257cbfd22b3bc86afff8c910372':
Updated Status bar icons Bug: 5297795
2011-09-19 17:51:38 -07:00
Justin Ho
1c89770d60
Merge "Updated Status bar icons Bug: 5297795" into ics-factoryrom
2011-09-19 17:49:53 -07:00
Fred Quintana
c7407d1bea
am acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
...
* commit 'acfd5ebb49bde9f64c604dfca5cbed8cafa64594':
An extra is being written as one type and read as the wrong type.
2011-09-19 17:33:20 -07:00
Fred Quintana
2c6b415153
Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
2011-09-19 17:30:44 -07:00
Ben Komalo
e3e08993ce
am 85a61c4d: Merge "Only run "core" apps when encrypting device." into ics-factoryrom
...
* commit '85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f':
Only run "core" apps when encrypting device.
2011-09-19 16:55:54 -07:00
Ben Komalo
fa7031b513
Merge "Only run "core" apps when encrypting device." into ics-factoryrom
2011-09-19 16:52:37 -07:00
Mathias Agopian
0450452e8c
Make sure Region handles invalid rectangles
...
the boolean operation code assumes rects are valid and
could go into an infinite loop if not. make sure we
abort before that happens.
Bug: 5331198, 5334829
Change-Id: Iee4e3b838ecf504ef21f7447fd2e34a56e7dc3f8
2011-09-19 16:50:17 -07:00
Mathias Agopian
000e95e7eb
fix the float Rect in OpenGLRenderer to handle NANs
...
- we want functions like isEmpty() to return true if NANs are
involved in the Rect
- also clean-up the intersect familly of calls
- minor cleanup in the int32_t Rect as well
These played a role in http://b/5331198 .
Bug: 5331198
Change-Id: I5369725ab482e4b83da9f1bd4cee5256e5de75b2
2011-09-19 16:50:07 -07:00
Jeff Brown
5560d9119c
Merge "TextLayoutCacheKey needs to store start and count."
2011-09-19 16:25:51 -07:00
Jean-Michel Trivi
2ed083a795
am 6c038506: Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
...
* commit '6c03850616a6e87de3e1943e47605cc5ebb20e2b':
Fix bug 5300223 Lockscreen should recycle bitmaps
2011-09-19 15:39:31 -07:00
Jean-Michel Trivi
5bb7046892
Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
2011-09-19 15:37:23 -07:00
John Reck
c8915f5dae
Merge "Disable extract mode in find on page"
2011-09-19 15:27:07 -07:00
Michael Jurka
110586465a
Merge "Speeding up Recent Apps"
2011-09-19 15:11:23 -07:00
Wink Saville
e73b4f1fd6
am c6939697: Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
...
* commit 'c69396973b8a496e298a7076842b0e34d193651e':
Remove isAnyActiveDataConnection and promote isDisconnected.
2011-09-19 15:09:42 -07:00
Wink Saville
ac864946bc
Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
2011-09-19 15:07:42 -07:00
Fabrice Di Meglio
0ebc52c1ab
Merge "TextLayoutCache code refactoring"
2011-09-19 15:06:34 -07:00
Wink Saville
26e4e466a5
am f946c282: Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
...
* commit 'f946c282c2fbe851d6157ed34bbacabdff8f76ba':
Add PROPERTY_IMS_REG_REQUIRED.
2011-09-19 15:02:05 -07:00
Wink Saville
f3e74f610a
Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
2011-09-19 14:59:26 -07:00
Mathias Agopian
2e176f34ca
Merge "fix EGL debugger"
2011-09-19 14:46:40 -07:00
Mathias Agopian
1ac8b72f4f
fix EGL debugger
...
always use GL_RGBA, GL_UNSIGNED_BYTE for screen capture
and make sure to handle GL_BGRA_EXT used on some gpu.
Change-Id: If9c973677fec8a5c4e72be22e7ef7d4bf5f008f4
2011-09-19 14:44:37 -07:00
Dianne Hackborn
4f42fceb38
am 2c2ab586: Fix issue #5260129 : Suggestion strip in Talk app not showing all the time
...
* commit '2c2ab5864f6037cebac5a4c73ec039f266d0dcfd':
Fix issue #5260129 : Suggestion strip in Talk app not showing all the time
2011-09-19 14:39:11 -07:00
Fred Quintana
57b7983745
am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()
...
* commit 'd88324d8ab8b98bbc2c21551be3a8981ee431181':
Fixed the javadoc for AccountManager.newChooseAccountIntent()
2011-09-19 13:59:21 -07:00
Dianne Hackborn
fd10f444ad
Merge "Maybe fix issue #5340190 : java.lang.RuntimeException: Unable to start..."
2011-09-19 13:34:15 -07:00
Andreas Huber
9045f91304
Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams"
2011-09-19 13:28:47 -07:00
David Brown
d881458da2
Merge "Update code to use location aware isEmergencyNumber."
2011-09-19 12:26:14 -07:00
David Hu
63eb37205e
Merge "Return the bundle object"
2011-09-19 12:11:11 -07:00
Fabrice Di Meglio
2ca4e9bac2
Merge "Fix potential leak in TextLayouCache"
2011-09-19 11:41:01 -07:00
Fabrice Di Meglio
c49d36adf8
Merge "Make TextLayoutCache no more dependent on ICU"
2011-09-19 11:40:51 -07:00
John Reck
fdade31e81
Merge "Bringing back the 'cache"
2011-09-19 11:07:28 -07:00
Gilles Debunne
4ff0e2d7f6
Merge "Bug 5290461: change voice IME underline span color"
2011-09-19 10:50:16 -07:00
Fred Quintana
143945769f
am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
...
* commit '79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
Continuation of the unified account chooser flow.
2011-09-19 10:46:03 -07:00
Fred Quintana
ba70e33636
Merge "Continuation of the unified account chooser flow." into ics-factoryrom
2011-09-19 10:43:59 -07:00
Dianne Hackborn
48028211c6
Merge "Fix issue #5260129 : Suggestion strip in Talk app not showing all the time"
2011-09-19 10:42:52 -07:00
Michael Jurka
83cd0e038e
am b0a1f197: Merge "Added "No recent apps" message on phones" into ics-factoryrom
...
* commit 'b0a1f197303d520d788ba11fcb0ac56f3a3c8604':
Added "No recent apps" message on phones
2011-09-19 10:34:39 -07:00
Michael Jurka
9e77281add
Merge "Added "No recent apps" message on phones" into ics-factoryrom
2011-09-19 10:33:08 -07:00
Philip Milne
d89fab280d
Merge "Fix for http://b/issue?id=5297155 "
2011-09-19 10:18:36 -07:00