Jaikumar Ganesh
a472ddfe73
Merge "Don't override the hash code for the channel."
2011-09-12 09:45:20 -07:00
The Android Open Source Project
f085ea2aa5
Reconcile with gingerbread-release
...
Change-Id: I4b6c483135fc0cb50e6de6c2fde845842c29e25c
2011-09-12 07:46:51 -07:00
Jean-Baptiste Queru
9c4da6a2a7
Ignore e4f0da70 from gingerbread-plus-aosp
...
Change-Id: I375563d4665ccb1948b17266afdc9c26cc7a7e35
2011-09-12 07:23:08 -07:00
satok
04141f48fc
Merge "Fix the visiblity of the ime switcher icon."
2011-09-12 00:25:41 -07:00
Daniel Sandler
48e5473288
Merge "Exit the keyguard when the user clicks a notification."
2011-09-11 17:08:50 -07:00
Daniel Sandler
0dc8b18849
Merge "Fix bug swiping away NO_CLEAR notifications."
2011-09-11 17:08:41 -07:00
Ben Komalo
9c42db5bd2
Merge "Revert encryption mapping for device wipes."
2011-09-11 16:48:32 -07:00
Amith Yamasani
bdb83913c0
Merge "Fix preference screen padding for legacy apps (non Holo)."
2011-09-11 15:58:31 -07:00
Neal Nguyen
907d5dccde
Merge "Fixing DownloadManager Test app."
2011-09-11 14:58:02 -07:00
Tsu Chiang Chuang
aca0620613
Merge "aggregating test results when reporting to instrumentation out."
2011-09-11 14:10:00 -07:00
Dianne Hackborn
c0cb447cbf
Merge "Fix inflating of animations."
2011-09-11 13:07:24 -07:00
Chet Haase
5d94a2f0a1
Merge "Fix 5266335: bad DIRTY/invalidation logic"
2011-09-11 12:58:45 -07:00
Dianne Hackborn
e5db226463
Merge "Fix build."
2011-09-11 11:21:09 -07:00
John Huang
dd04321d8f
Merge "Handle HSPAP."
2011-09-11 11:13:29 -07:00
Dianne Hackborn
af501694f1
Merge "The wave view attributes should not be public."
2011-09-11 10:56:01 -07:00
Derek Sollenberger
4ede4f743f
am 5b98d3a7: am e91c8d04: Added interface to SurfaceTexture needed by WebKit.
...
* commit '5b98d3a70d64c46b8d925415a30a7a7d8453d866':
Added interface to SurfaceTexture needed by WebKit.
2011-09-11 07:41:37 -07:00
Derek Sollenberger
42382dd8a7
am e91c8d04: Added interface to SurfaceTexture needed by WebKit.
...
* commit 'e91c8d0414333e4686a4473aaf1d8b1b1e0ba291':
Added interface to SurfaceTexture needed by WebKit.
2011-09-11 07:35:00 -07:00
Svetoslav Ganov
abffdcaaef
Merge "Inter process interrogation ocassionally gets stuck."
2011-09-09 18:57:35 -07:00
Adam Powell
a999b9ba51
Merge "Fix metrics on Holo progress dialogs"
2011-09-09 17:47:23 -07:00
Romain Guy
00736a7f0c
Merge "Go faster!!!!"
2011-09-09 17:35:02 -07:00
James Dong
acc117b6aa
Merge "MTS Recorder Test: Use VideoFrameRate from Device Camcorder Profile"
2011-09-09 17:32:50 -07:00
Jeff Brown
ec9a0599fa
Merge "Tweak VelocityTracker. Bug: 5265529"
2011-09-09 17:01:25 -07:00
Ben Murdoch
e271bf8fe9
Merge "Relax form autocomplete conditions"
2011-09-09 16:14:20 -07:00
Adam Powell
8bba592b49
Merge "Fix bug 5214224 - Align stock framework list item padding for dialogs"
2011-09-09 16:12:03 -07:00
Jeff Brown
137c3c5495
Tweak VelocityTracker.
...
Bug: 5265529
Calculate the velocity using the most recent touch sample as the
point of reference instead of the oldest. This change more heavily
weights recent touch samples and reduces the sample time window
used for calculation. This significantly improves the accuracy
of fling gesture detection.
Change-Id: Ib1940933e786e5f6a731552a99bcd9400741d55f
2011-09-09 16:04:09 -07:00
Gilles Debunne
d866db31ec
Merge "Bug 5255124: Move cursor to the end of a word after correction popup alternates selection"
2011-09-09 16:01:08 -07:00
Robert Greenwalt
8cb463ef9b
am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
...
* commit '2f835a6193c14e27cf761d85ac3ea4c9bd9296f8':
Make copies of NetworkInfo to give out.
2011-09-09 15:52:42 -07:00
Gilles Debunne
5f42fdbc01
Merge "Bug 5278456: text highlight color depends on the type of suggestion spans."
2011-09-09 15:52:09 -07:00
Robert Greenwalt
65bdcd5431
Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
2011-09-09 15:51:22 -07:00
James Dong
145af76dbe
Merge "Fix another hardcoded frame rate in the media framework test"
2011-09-09 15:50:39 -07:00
Dianne Hackborn
2e67f143fa
Merge "Pull animation attributes out of main view class."
2011-09-09 15:27:44 -07:00
Jaikumar Ganesh
aa48640364
Merge "Add error codes for channel disconnection / connection."
2011-09-09 15:19:43 -07:00
Adam Powell
7c63be905a
Merge "Bug 5214224 - List item metrics"
2011-09-09 15:18:01 -07:00
Irfan Sheriff
7410bedd35
Merge "Finalize wifi watchdog default settings"
2011-09-09 15:15:13 -07:00
Irfan Sheriff
80e4ed32ed
Merge "Disable p2p when airplane mode is turned on"
2011-09-09 15:11:44 -07:00
Jim Miller
058284d25a
Merge "Allow lockscreen orientation to be overridden with a system property."
2011-09-09 15:01:49 -07:00
Kazuhiro Ondo
c39d52af4a
am b1a3f0ca: Fix no data issue after system server crash
...
* commit 'b1a3f0ca4b23b882fc1a5e83eaa412c0ed76696f':
Fix no data issue after system server crash
2011-09-09 15:00:51 -07:00
James Dong
b2d83aa291
Merge "Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
2011-09-09 14:56:30 -07:00
Dianne Hackborn
7610abb643
Merge "Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens"
2011-09-09 14:53:53 -07:00
yoonsung.nam
8be3fc7848
am 37f770f0: DO NOT MERGE: Notify overall state instead of current changed state
...
* commit '37f770f03f975982fbe7a1f133e03724bd3dc81a':
DO NOT MERGE: Notify overall state instead of current changed state
2011-09-09 14:33:33 -07:00
Dianne Hackborn
a9c82ecf3e
Merge "Fix issue #5273986 : The power usage of the mp3 background playback..."
2011-09-09 14:28:05 -07:00
Kazuhiro Ondo
376b9e3431
am eb7763ef: DO NOT MERGE: Fix leak in SIM ready registrants
...
* commit 'eb7763efa52bad67ff828ad895ff172190e86035':
DO NOT MERGE: Fix leak in SIM ready registrants
2011-09-09 13:55:13 -07:00
Peter Ng
406ccd7cdf
Merge "list_dividers for xh are now 2pixels high."
2011-09-09 13:38:40 -07:00
Peter Ng
b8cfe1a0a2
Merge "Updated CAB done assets"
2011-09-09 11:27:40 -07:00
Svetoslav Ganov
a42dfddee6
Merge "The time and data pickers did not support IME editor action correctly."
2011-09-09 11:24:24 -07:00
Svetoslav Ganov
4e95eae036
Merge "Update the sharing UI according to latest UX specs."
2011-09-09 11:18:40 -07:00
Jeff Brown
ee1f6d50e5
Merge "Adjust layers for system overlays."
2011-09-09 11:06:25 -07:00
Brian Colonna
9a8cacf706
Merge "Moved FaceLock bind/unbind calls inside of null check"
2011-09-09 10:52:09 -07:00
Daniel Sandler
9cf64fc220
Merge "Show roaming icon in status bar."
2011-09-09 10:39:04 -07:00
Subir Jhanb
6d9933ade7
Merge "NPE check in the SyncStateContract BUG:5196483"
2011-09-09 10:36:09 -07:00