55958 Commits

Author SHA1 Message Date
Steve Block
1a1ceac9f6 Improve a network error description
Bug: 5103592
Change-Id: I6deaa69f08acb93fec4c9bd7c2fd581fd76518f8
2011-08-05 12:35:06 +01:00
satok
0dc8bb25d2 Merge "API cleanup for the spell checker framework" 2011-08-05 03:59:06 -07:00
Ken Wakasa
bd391ba1f2 Suppress the IME switcher icon by default on tablet
bug: 5001205
Change-Id: I8c983808078d984d1d25e985e23ab036b869332e
2011-08-05 18:17:30 +09:00
Jim Miller
adff7fa2f6 Merge "Fix 5117544: Fix crash in KeyguardStatusViewManager when resId==0" 2011-08-04 23:26:48 -07:00
Daniel Sandler
f35ed37321 Merge "Fix another NPE." 2011-08-04 19:15:49 -07:00
Jim Miller
e0c2d8e5d4 Fix 5117544: Fix crash in KeyguardStatusViewManager when resId==0
Change-Id: If870760f7dcafe02084af4c82db7dbb809c31c75
2011-08-04 19:03:18 -07:00
The Android Open Source Project
ca0c1a3c51 Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9
2011-08-04 18:46:02 -07:00
Tsu Chiang Chuang
4adcfb3b01 Merge "Bandwidth microbenchmark test app for ICS." 2011-08-04 18:34:53 -07:00
Adam Powell
f14f8ddd95 Merge "Fix bug 5118908 - ImageView.setImageDrawable always requests layout" 2011-08-04 18:32:18 -07:00
Adam Powell
2a0e99da03 Fix bug 5118908 - ImageView.setImageDrawable always requests layout
Make ImageView a bit more conservative about when it requests a
layout. This improves performance for ListViews where apps
asynchronously load images and replace placeholders outside of the
optimized getView path.

Change-Id: I564a4a343ab9c8c2d5baf907b5f573b5ee02c87a
2011-08-04 18:30:46 -07:00
Amith Yamasani
f88f8c92df Merge "Don't call onQueryTextChanged more often than necessary." 2011-08-04 18:25:32 -07:00
Jim Miller
f1eaf7f439 Merge "Fix 5045008: replace "ring/silence" target in LockScreen with camera app" 2011-08-04 18:06:03 -07:00
Jim Miller
be8d1cf1ac Fix 5045008: replace "ring/silence" target in LockScreen with camera app
This change replaces the ring/silence target with a camera target.  It
is disabled and falls back to the old behavior when any device policy
disables the camera.

Updated with latest icons.

Change-Id: I2374eba08f85ff1d1b0bad2859efa30bb166fb60
2011-08-04 18:00:14 -07:00
Jeff Sharkey
61d7cd460c Merge "Data cycle ends on last second of month." 2011-08-04 17:33:19 -07:00
Jeff Sharkey
af82ea2abf Data cycle ends on last second of month.
When data cycle resets on a day invalid in given month, snap the
cycle to last second of month.  Previous behavior was to bump fully
into next month, but that causes cycle loops.

Includes tests to verify.

Bug: 4623124
Change-Id: I2f233091f6f1df33a2814284519cbc04532874e9
2011-08-04 17:07:08 -07:00
Gloria Wang
803b192ea2 Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079." 2011-08-04 16:32:10 -07:00
Gloria Wang
1467ec3433 Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug 5015079.

Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
2011-08-04 16:01:35 -07:00
Chet Haase
163efc0285 Merge "Fix AnimatorSet cancellation issues" 2011-08-04 15:47:21 -07:00
Jeff Sharkey
fe313490fb Merge "Network stats with varint, omit parcel fields." 2011-08-04 15:39:24 -07:00
Steve Block
d6a89b48c9 am 03f8fcb8: (-s ours) am c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '03f8fcb8b017556df08d9926f8ca41b383c5ad08':
  Cherry-pick DeviceMotionService CL from master [do not merge]
2011-08-04 15:36:04 -07:00
Irfan Sheriff
d6d0628051 Merge "Rewrote DnsPinger - now is async and concurrant" 2011-08-04 15:34:47 -07:00
Gloria Wang
188d661d93 Merge "resolved conflicts for merge of 845fdba7 to master" 2011-08-04 15:33:12 -07:00
Andreas Huber
a9307bef53 Merge "Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer" 2011-08-04 15:20:24 -07:00
Gloria Wang
09337a07fa resolved conflicts for merge of 845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
2011-08-04 15:13:14 -07:00
Andreas Huber
e38a2cba16 Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer
Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug: 5122973
2011-08-04 15:05:17 -07:00
Steve Block
03f8fcb8b0 am c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit 'c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
  Cherry-pick DeviceMotionService CL from master [do not merge]
2011-08-04 14:49:44 -07:00
Gloria Wang
845fdba7b5 am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
  Bug fixes in OMA DRM v1 Forward Lock Agent
2011-08-04 14:47:43 -07:00
Gloria Wang
8a6fb50d69 am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
  Bug fixes in OMA DRM v1 Forward Lock Agent
2011-08-04 14:36:45 -07:00
Gloria Wang
4e197ea8a6 am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit 'e15a73ee4c9a28d89888095c7649a70c116ee160':
  Bug fixes in OMA DRM v1 Forward Lock Agent
2011-08-04 14:33:06 -07:00
Amith Yamasani
b47c4fd206 Don't call onQueryTextChanged more often than necessary.
Also update the hint text if iconifiedByDefault changes.

Bug: 5097238
Change-Id: I876b3f3e74c30230f68d6bc88a95e182e4cc652b
2011-08-04 14:30:07 -07:00
Gloria Wang
e15a73ee4c Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 2011-08-04 14:20:53 -07:00
Chet Haase
b8f574a165 Fix AnimatorSet cancellation issues
AnimatorSet was incorrectly ignoring cancel() when it was in the
initial startDelay phase. Fix is to change isRunning() to be true if the
animator is also in its delay phase.

Change-Id: I1a8c877de24fa294beea0ba30d495658255b13b3
2011-08-04 14:16:48 -07:00
Jean-Michel Trivi
e83af902c4 Merge "Remove empty remote control client listener methods" 2011-08-04 14:10:57 -07:00
Adam Powell
b491877331 Merge "Fix bug 5121406 - ActionBar.setLogo" 2011-08-04 13:21:07 -07:00
Adam Powell
29764eab44 Fix bug 5121406 - ActionBar.setLogo
Make the resource ID version of setLogo work.

Change-Id: I0a710b714c9fd10bc3063a8ec95e59391ba4d4e0
2011-08-04 13:12:01 -07:00
Chia-chi Yeh
b234636105 Merge "VPN: move away from the VPN permission." 2011-08-04 13:04:51 -07:00
Andreas Huber
e30d6f1588 Merge "Restart HLS streaming from the bottom of the playlist if we miss the boat on the" 2011-08-04 12:57:45 -07:00
Daniel Sandler
f48fd822e0 Fix another NPE.
Bug: 5122306
Change-Id: I6877528325d30bb725f8692c86a8752263b5344e
2011-08-04 15:57:39 -04:00
Xavier Ducrohet
14434ed6e7 am 23ce76ce: am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound."
* commit '23ce76ce1666e5e8b0b17825c271b133ba2626d6':
  Insert a break wraparound.
2011-08-04 12:56:46 -07:00
Xavier Ducrohet
23ce76ce16 am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound."
* commit '320834c9e02364b39b98b610f1d2244cbb9a4f26':
  Insert a break wraparound.
2011-08-04 12:54:49 -07:00
Xavier Ducrohet
320834c9e0 am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound."
* commit 'b9e8b25e9066d6f2da0635eaac524246b729fbfa':
  Insert a break wraparound.
2011-08-04 12:52:34 -07:00
Xavier Ducrohet
b9e8b25e90 am 6b3a0123: Merge "Insert a break wraparound."
* commit '6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
  Insert a break wraparound.
2011-08-04 12:50:11 -07:00
Xavier Ducrohet
6b3a012348 Merge "Insert a break wraparound." 2011-08-04 12:36:11 -07:00
Xavier Ducrohet
b7ef4cb254 Merge "Layoutlib: implement Resources.getBoolean(int)." 2011-08-04 12:18:17 -07:00
Andreas Huber
323e31754c Restart HLS streaming from the bottom of the playlist if we miss the boat on the
next segment. This can happen if for whatever reason we playback video slower than
it is served.

Also removed some unnecessary verbosity from ChromiumHTTPDataSource.

Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79
related-to-bug: 5120425
2011-08-04 12:10:29 -07:00
Steve Block
c4d93ba55f Cherry-pick DeviceMotionService CL from master [do not merge]
In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering.

cherry-pick of Change: d09001fea476ca6c6eaff5e29a1bb6f3aebe5bd5

Bug: 5110230
Change-Id: Id1d1f51b445ce4a14bfcdfad8f173922e01b6563
2011-08-04 10:59:59 -07:00
Adam Powell
0a2a287987 Merge "Fix bug 5073637 - Market apps crashing FastScroller" 2011-08-04 10:51:57 -07:00
Adam Powell
568ccd88d7 Fix bug 5073637 - Market apps crashing FastScroller
It seems that some popular Market apps do not properly implement
SectionIndexer#getSectionForPosition and the framework did not
previously call it. Revert to more simplistic scrollbar behavior for
apps targeting sdk < Honeycomb.

Change-Id: If0b1f2b4db540de4bb8ba45798e498c09cddb42f
2011-08-04 10:36:37 -07:00
Isaac Levy
d2fe04b71a Rewrote DnsPinger - now is async and concurrant
Change-Id: I93e1374ae857832935202614e34ce18f040fcfc7
2011-08-04 10:35:29 -07:00
Irfan Sheriff
aead35a850 Merge "Fix p2p package paths" 2011-08-04 10:29:23 -07:00