20426 Commits

Author SHA1 Message Date
Gilles Debunne
a6c673bd6f Bug 5278473 & 5278471: delete option in suggestion popup menu
Also added + and x icons on that line.

Change-Id: I508ae48f83eb7a831f24bb4f81933d9e698abde6
2011-09-27 18:24:17 -07:00
Scott Main
4c08848538 Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links" 2011-09-27 14:49:12 -07:00
Scott Main
2d68a6ba3c docs: mix of BT and NFC javadoc updates
Add Health profile to various discussions about profiles
Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links

Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
2011-09-27 14:04:48 -07:00
Alon Albert
553e547420 Merge "Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:" 2011-09-27 13:29:11 -07:00
Alon Albert
e0bde33e0d Add Detailed Sync Stats Section
Also improve history formatting
Here's a smaple of what it looks like:

Detailed Statistics (Recent history):  20  40s
-------------------------------------------------------------------------------------
  com.android.contacts                                        : 9/45%      11/27%
    aagmtest1@gmail.com/com.google                            :   3/15%      4/11%
    aagmtest2@gmail.com/com.google                            :   3/15%      3/9%
    aalbert@google.com/com.google                             :   3/15%      2/6%
-------------------------------------------------------------------------------------
  gmail-ls                                                    : 6/30%      22/56%
-------------------------------------------------------------------------------------
  com.android.calendar                                        : 3/15%      5/14%
    aagmtest1@gmail.com/com.google                            :   1/5%       4/12%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
    aalbert@google.com/com.google                             :   1/5%       0/0%
-------------------------------------------------------------------------------------
  com.google.android.apps.plus.content.EsGooglePhotoProvider  : 2/10%      0/1%
    aagmtest1@gmail.com/com.google                            :   1/5%       0/1%
    aagmtest2@gmail.com/com.google                            :   1/5%       0/0%
-------------------------------------------------------------------------------------

Recent Sync History
  #1  : 2011-09-23 15:18:35   SERVER    0.8s  aalbert@google.com/com.google   gmail-ls
  #2  : 2011-09-23 15:17:56   SERVER    1.3s  00:38
  #3  : 2011-09-23 15:17:52   SERVER    4.6s  00:04
  #4  : 2011-09-23 15:17:45   SERVER    1.7s  00:06
  #5  : 2011-09-23 15:16:51    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #6  : 2011-09-23 15:16:51    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #7  : 2011-09-23 15:16:50    LOCAL    0.7s  aagmtest1@gmail.com/com.google  com.android.contacts
  #8  : 2011-09-23 15:15:35    LOCAL    0.7s  aalbert@google.com/com.google   com.android.contacts
  #9  : 2011-09-23 15:15:34    LOCAL    0.8s  aagmtest2@gmail.com/com.google  com.android.contacts
  #10 : 2011-09-23 15:15:33    LOCAL    1.9s  aagmtest1@gmail.com/com.google  com.android.contacts
  #11 : 2011-09-23 15:14:37    LOCAL    1.3s  aalbert@google.com/com.google   com.android.contacts
  #12 : 2011-09-23 15:14:35    LOCAL    2.0s  aagmtest1@gmail.com/com.google  com.android.contacts
  #13 : 2011-09-23 15:14:32    LOCAL    2.2s  aagmtest2@gmail.com/com.google  com.android.contacts
  #14 : 2011-09-23 15:13:41   SERVER    1.3s  aalbert@google.com/com.google   gmail-ls
  #15 : 2011-09-23 15:13:34    LOCAL    0.3s  aalbert@google.com/com.google   com.android.calendar
  #16 : 2011-09-23 15:13:34    LOCAL    0.4s  aagmtest2@gmail.com/com.google  com.android.calendar
  #17 : 2011-09-23 15:13:33   SERVER    0.1s  aagmtest2@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #18 : 2011-09-23 15:13:33   SERVER    0.5s  aagmtest1@gmail.com/com.google  com.google.android.apps.plus.content.EsGooglePhotoProvider
  #19 : 2011-09-23 15:13:29    LOCAL    4.9s  aagmtest1@gmail.com/com.google  com.android.calendar
  #20 : 2011-09-23 15:13:28   SERVER   13.1s  aalbert@google.com/com.google   gmail-ls

Change-Id: Idc904e2e18a373b6d2d10af65b02683c11fd8d90
2011-09-27 13:15:30 -07:00
Adam Powell
2b2adbdda0 Merge "Improve docs in BaseAdapter." 2011-09-27 12:06:33 -07:00
Adam Powell
f5d412a0c7 Improve docs in BaseAdapter.
Change-Id: Idbe19f9b01132c28b4960515c23bd28e3729fd5d
2011-09-27 11:32:59 -07:00
Steve Block
a3b06ff933 Merge changes If97c4d76,I1cd975b1
* changes:
  Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
  Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
2011-09-27 10:52:50 -07:00
Teng-Hui Zhu
8d48b75b0c Merge "Double check the permission before setting the Wake Lock" 2011-09-27 09:07:13 -07:00
Steve Block
9a0cd15eec Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
This looks like a copy-paste error from other CallbackProxy methods which call
back to the WebViewClient or WebChromeClient, rather than the WebView.

Also remove '@hide' annotations. These are superfluous as the class is not
public.

Bug: 5287216
Change-Id: If97c4d769cf82563b9c182ba09fc742fbb7e08e9
2011-09-27 16:42:51 +01:00
Steve Block
200ff0a7b1 Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError().

Bug: 5287216
Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
2011-09-27 16:42:45 +01:00
Scott Main
e187d8148a Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5" 2011-09-26 21:55:24 -07:00
Scott Main
4510705b28 docs: fix markup in javadocs
Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5
2011-09-26 21:53:24 -07:00
Jim Miller
a2f00da374 am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom
* commit 'b4f0a9f3894c1f039168ad672f4aa194999c7cdd':
  Fix 5326463: rework sim state handling in lockscreen
2011-09-26 20:40:59 -07:00
Fabrice Di Meglio
3a6c2e9855 am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom
* commit 'a200a23af10dfcbbe46d10e868c2eae9f2c794a4':
  Bug 5332065: IOOB in case the suggestionSpan has been removed
2011-09-26 20:40:54 -07:00
Jim Miller
b4f0a9f389 Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom 2011-09-26 18:41:01 -07:00
Teng-Hui Zhu
fb2fd5f52c Double check the permission before setting the Wake Lock
bug:5361732
Change-Id: Ia9092b25d62c4a14cba885f5e3fac0326d0fde1c
2011-09-26 17:36:11 -07:00
Gilles Debunne
14ed50a9a3 Bug 5332065: IOOB in case the suggestionSpan has been removed
I don't understand how the SuggSpan that has been tapped to display
the popup can have disappeared when an item is clicked.

This problem seems specific to monkey test with a race condition somewhere.

Change-Id: I447b6563a1b959dc3c1ead31cde2d9bcad369765
2011-09-26 15:59:24 -07:00
Jeff Sharkey
ba8dea03f3 Merge "Overlay to configure data usage network types." 2011-09-26 15:34:06 -07:00
Jim Miller
3f5f83b54f Fix 5326463: rework sim state handling in lockscreen
Previously it was possible to get an inconsistent state because there
were two paths that updated the lock screen sim state.  This reworks
the data flow to ensure the same path is always used to update the state.

KeyguardUpdateMonitor now correctly updates the entire state of the callee
whenever a new callback is registered.

In addition, KeyguardUpdateMonitor now caches the phone state in order
to avoid a round-trip binder call in updateEmergencyCallButtonState().
This avoids a condition that could make lockscreen unresponsive while
updating the emergency call button state.

KeyguardStatusViewManager also ensures the TransportControlView is
hidden when created to ensure we don't inappropriately update the carrier
line while waiting for the first callbacks to update the status lines.

Change-Id: I6b3975b703a7d90bac8d0fe29fbc0f1d9c5e0e7d
2011-09-26 15:17:05 -07:00
Chet Haase
f425ca9772 Merge "Fix display list issue that was crashing an external app." 2011-09-26 14:46:19 -07:00
Chet Haase
6e6db61809 Fix display list issue that was crashing an external app.
The app was removing a View whilst in its onDraw() method. This meant
that we asked it for its display list and it invalidated that display list
(by removing itself) before it returned from onDraw(). We later attempted to
draw that invalid display list into its parent nad died in native code.

The fix is to check the state of the display list after the call to getDisplayList()
and to avoid doing further work with it if it's invalid.

Change-Id: I14a342b4fe79c8dce2626ff61237b447040e7f42
2011-09-26 14:32:26 -07:00
Gilles Debunne
52edaa9cfb Merge "Bug 5250788: TextView gets slower as the text length grows" 2011-09-26 14:18:14 -07:00
Fabrice Di Meglio
8013290dd0 Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE" 2011-09-26 12:16:41 -07:00
Fabrice Di Meglio
8eb34ed88c Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak" 2011-09-26 12:16:30 -07:00
Jeff Sharkey
630a171216 Overlay to configure data usage network types.
Specify which network types should be counted when computing data
usage totals.

Bug: 5361005
Change-Id: I830caed1a29199892d209a692b50f8b3e144cafe
2011-09-26 10:50:30 -07:00
Gilles Debunne
ea1c7f3c51 Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 2011-09-26 10:38:58 -07:00
Kenny Root
8a663c89a3 Merge "Allow non-required package verifiers" 2011-09-26 09:53:06 -07:00
Steve Block
2cdbe2f1cf Merge "Update the error for WebView thread violations to make clear that it's not fatal" 2011-09-26 08:41:09 -07:00
Steve Block
7a01d94c5e Update the error for WebView thread violations to make clear that it's not fatal
- Update the description
- Use Throwable rather than RuntimeException
- Log as a warning rather than an error

Bug: 5313494
Change-Id: If13ce2088e7080122db14e5e0565f64e6d6f4320
2011-09-26 14:59:12 +01:00
Ben Murdoch
e0b0578a1e Merge "Force a WebView pictureset invalidation on screen rotation." 2011-09-26 06:19:56 -07:00
Jeff Sharkey
61c0818f24 Merge "Watch network subtype, tethering teardown, empty." 2011-09-25 23:44:10 -07:00
Fabrice Di Meglio
09175735c5 Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak
- make the StaticLayout constructor not depending on the text as we just need the "generate()" call to be done

Change-Id: I65249e65ed6446b6ac13dbf8c8f58fcdf54046cb
2011-09-25 16:48:04 -07:00
Fabrice Di Meglio
cb332649e4 Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE
- introduce TruncateAt.END_SMALL
- code refactoring for suppressing use of hardcoded constants

Change-Id: I70e24857cd5d6bd012a743cbc0ba46fbd06d5457
2011-09-25 14:39:27 -07:00
Adam Powell
53f56c4f51 Fix bug 5358705 - Request no full-screen mode of the IME when a
SearchView is expanded in an action bar

This is a case where we always know there will be room on screen for
the user to meaningfully use the UI in the absence of full-screen
extract mode. Save the old state and restore it when we go in and out
of expanded action bar mode.

Change-Id: I4ae2c5df4f581c6824e6a1f7ff8d97fd86d8e260
2011-09-25 13:50:57 -07:00
Brandon Keely
296296caf6 Merge "Avoid double-ping when tapping outside the handle." 2011-09-24 15:16:54 -07:00
Brandon Keely
72ec81441a Avoid double-ping when tapping outside the handle.
Change-Id: Iccab649e075fc86a860c1ce6e8df173e9968bef2
2011-09-23 18:47:00 -07:00
Jeff Brown
4c253119db Merge "Prevent unintended rotations. Bug: 4981385" 2011-09-23 18:28:01 -07:00
Adam Powell
275702c2f4 Fix bug 5355889 - Search action showing up in the menu dropdown in
spite of search actionview being expanded

Make sure that menu items with an expanded action view don't show up
in list menus presenting the rest of the menu.

Change-Id: I8c7b4e184a9d3ea2457543d0b8b36bc8e7068052
2011-09-23 17:36:15 -07:00
Jeff Brown
c0347aa19f Prevent unintended rotations.
Bug: 4981385

Changed the orientation listener to notify the policy whenever
its proposed orientation changes, and changes the window manager
to notify the orientation listener when the actual orientation
changes.  This allows us to better handle the case where the
policy has rejected a given proposal at one time (because the
current application forced orientation) but might choose
to accept the same proposal at another time.

It's important that the proposal always be up to date.  A proposal
becomes irrelevant as soon as the phone posture changes such
that we can no longer determine the orientation with confidence
(such as when a device is placed flat on a table).

Simplified the orientation filtering.  Now we just wait 200ms
for the device to be still before issuing a proposal.  The idea
is that if the device is moving around a lot, we assume that
the device is being picked up or put down or otherwise in
the process of being moved.  We don't want to change the rotation
until that's all settled down.  However, we do want to tolerate
a certain amount of environmental noise.

(The previous confidence algorithm was also designed along
these lines but it was less direct about waiting for things
to settle.  Instead it simply made orientation changes take
longer than usual while unsettled, but the extra delay was often
too much or too little.  This one should be easier to tune.)

Change-Id: I09e6befea1f0994b6b15d424f3182859c0d9a530
2011-09-23 17:26:09 -07:00
Kenny Root
05ca4c9064 Allow non-required package verifiers
* Verifiers can be specified in the AndroidManifest.xml

* Those verifiers can respond to the new Intent action

* PackageManager API for those verifiers: verifyPendingInstall

Change-Id: I4892bce2e6984871e6e93c60a1ca0dae145f5df5
2011-09-23 16:03:03 -07:00
Irfan Sheriff
15bbaeb075 am c21994bc: Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
* commit 'c21994bc26df959d1a7161e38b4402b7255ea321':
  Fix watchdog to stop ping after wifi disconnects
2011-09-23 15:20:56 -07:00
Irfan Sheriff
c21994bc26 Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom 2011-09-23 15:18:37 -07:00
Fabrice Di Meglio
ba7bc59101 Merge "Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height" 2011-09-23 15:18:37 -07:00
Adam Powell
6ed1bfb1b6 Merge "Fix bug 5341139 - bottom bar stays if app wants to handle orientation change" 2011-09-23 15:06:30 -07:00
Dianne Hackborn
a982ad19d2 Merge "Fix issue #5173952: Opening a Notification From Lock Screen..." 2011-09-23 14:54:26 -07:00
John Reck
6c984bcb17 Merge "Add detail to restorePicture deprecation" 2011-09-23 14:48:52 -07:00
Irfan Sheriff
32f04e9009 Fix watchdog to stop ping after wifi disconnects
- The pings are delayed async messages that were getting handled
after a disconnect as well

- Increase poll time to 200 ms, so we block on a receive for 1ms every 200ms for a
sent packet

Bug: 5361564
Change-Id: I1931a1c4146e78a87407d541d8c3934ff8232604
2011-09-23 14:48:26 -07:00
Adam Powell
a05aba9c50 Fix bug 5341139 - bottom bar stays if app wants to handle orientation
change

Let action bars move between split/unsplit mode on configuration
changes if set to split when narrow.

Change-Id: I13f5115a65247cb1878ee823493ca8e2b6ba4cf6
2011-09-23 14:23:30 -07:00
Fabrice Di Meglio
8a5137a5ae Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height
- save current metrics values before updating them

Change-Id: I2d88dd7d30e8e01d0c5e2328973f256b689672b2
2011-09-23 13:40:58 -07:00