The Android Automerger
7b57fda608
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 20:43:04 -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
f430f33281
Merge "Upload correct txPackets count." into ics-factoryrom
2011-09-19 21:42:13 -07:00
James Dong
8e97a40c42
Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
2011-09-19 20:06:52 -07:00
Irfan Sheriff
66e5adf085
Merge "Add supplication shut down recovery" into ics-factoryrom
2011-09-19 18:58:58 -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
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
fa7031b513
Merge "Only run "core" apps when encrypting device." into ics-factoryrom
2011-09-19 16:52:37 -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
Wink Saville
ac864946bc
Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
2011-09-19 15:07:42 -07:00
Wink Saville
f3e74f610a
Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
2011-09-19 14:59:26 -07:00
Fred Quintana
ba70e33636
Merge "Continuation of the unified account chooser flow." into ics-factoryrom
2011-09-19 10:43:59 -07:00
Michael Jurka
9e77281add
Merge "Added "No recent apps" message on phones" into ics-factoryrom
2011-09-19 10:33:08 -07:00
Jean-Michel Trivi
b84fd9ffe1
Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
2011-09-19 09:46:32 -07:00
The Android Automerger
2ecb694c4a
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-19 06:28:09 -07:00
Justin Ho
d9e2e2bbc1
Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
2011-09-18 16:56:12 -07:00
Jeff Sharkey
579288a63b
Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
2011-09-18 16:20:00 -07:00
Jeff Sharkey
5280510bbe
Merge "Collect and persist tethering stats." into ics-factoryrom
2011-09-18 16:15:51 -07:00
The Android Automerger
ea2367853e
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-18 06:27:55 -07:00
Jeff Brown
77daff7712
Merge "Can't stop the fling! Bug: 5335420" into ics-factoryrom
2011-09-16 23:29:15 -07:00
Wink Saville
3b01d26e58
Merge "Have all connections disconnected before turning off radio." into ics-factoryrom
2011-09-16 22:00:34 -07:00
Jeff Brown
df9440f62f
Can't stop the fling!
...
Bug: 5335420
Fixed a bug in VelocityTracker where the output velocity was
not being set to zero when not available.
Added a condition to ensure that the velocity is at least
the minimum fling velocity before continuing. If not, then
the user is trying to stop the fling and scroll more precisely.
Change-Id: I36634b0c3f7a9a09cf20c33f71d41163a8e33eed
2011-09-16 21:43:58 -07:00
Mathias Agopian
0d8088e8f1
Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
2011-09-16 17:08:21 -07:00
Eric Fischer
8d7c5ea0fd
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-16 16:17:45 -07:00
Jean-Michel Trivi
7990b9d409
Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
2011-09-16 15:01:06 -07:00
Justin Ho
0390fd7eb3
Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
2011-09-16 14:47:54 -07:00
Justin Ho
a6a42ff456
Merge "Adding selected state for scrubber control" into ics-factoryrom
2011-09-16 14:15:04 -07:00
Jeff Brown
d20d20b5da
Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
2011-09-16 13:42:46 -07:00
John Reck
35e59f0617
Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
2011-09-16 13:21:31 -07:00
Fred Quintana
975b1328f3
Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
2011-09-16 12:13:30 -07:00
Eino-Ville Talvala
f6c0011ad2
Merge "Add third video to default system videos." into ics-factoryrom
2011-09-16 10:52:15 -07:00
Kenny Root
c4fd8ada67
Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
2011-09-16 09:07:52 -07:00
Justin Ho
a2688e4c7c
Merge "Updated Clock and Roboto fonts Bug: 5243711" into ics-factoryrom
2011-09-16 07:32:52 -07:00
Svetoslav Ganov
dd434337ab
Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
2011-09-15 18:52:40 -07:00
Svetoslav Ganov
fcb3f65263
Merge "Touch explorer does not perform tap with the right pointer." into ics-factoryrom
2011-09-15 18:47:49 -07:00
Ying Wang
5668777ffc
Merge "Use the correct dependency" into ics-factoryrom
2011-09-15 17:19:37 -07:00
Gloria Wang
f629de24fa
Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge." into ics-factoryrom
2011-09-15 17:04:27 -07:00
Gloria Wang
d8793af9f2
Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296." into ics-factoryrom
2011-09-15 17:04:02 -07:00
John Reck
1e2e9af536
Merge "DO NOT MERGE Fix finalization" into ics-factoryrom
2011-09-15 11:49:00 -07:00
Dianne Hackborn
caf953f02c
Merge "Final (ha ha) API 14."
2011-09-15 00:32:15 -07:00
Chia-chi Yeh
7b90a6cc50
Merge "VpnDialogs: add string description for translation."
2011-09-15 00:06:23 -07:00
Dianne Hackborn
d30e4a877c
Merge "Update the public APIs for finding views by text to optionally use content description."
2011-09-14 22:33:54 -07:00
Jeff Sharkey
ac643fca82
Merge "Network stats flag to force complete poll."
2011-09-14 21:44:19 -07:00
Jeff Brown
abb37794bd
Merge "Velocity Tracker II: The Revenge of Velocity Tracker Bug: 5265529"
2011-09-14 21:27:25 -07:00
satok
d12ab2d5b8
Merge "Call onFinishInputView in onDestroy"
2011-09-14 21:13:06 -07:00
Jeff Sharkey
22af3d7ba9
Merge "Change data usage warning notification wording."
2011-09-14 20:27:55 -07:00
Peter Ng
9afa5a125a
Merge "Status_bar_close that works on light and dark"
2011-09-14 20:27:14 -07:00
Justin Ho
4430fe6869
Merge "Add 480p default videos into the system."
2011-09-14 20:24:06 -07:00
Adam Powell
07031a8e76
Merge "Fix bug 5321195 - Starting WebView text selection with long press does not invoke haptic feedback"
2011-09-14 19:28:53 -07:00
Dianne Hackborn
c56b6c4306
Merge "Fix issue #5155678 : Portrait > Landscape full-screen transition..."
2011-09-14 19:26:23 -07:00
