59450 Commits

Author SHA1 Message Date
Irfan Sheriff
953dd38201 Merge "Add a time threshold for re-enabling networks" 2011-10-05 16:34:40 -07:00
Fabrice Di Meglio
764041d213 Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
- make VERY_WIDE bigger ... 64 times actually

Change-Id: I1a177ef5821d9341abb77ea69a50e05a5bfc97b5
2011-10-05 16:28:18 -07:00
Jeff Sharkey
03320fcb67 Reference download asset through intermediate.
Instead of referencing PNG directly, use an intermediate <bitmap>
to handle density resolution.

Bug: 5366540
Change-Id: I233e292d88ac33995eab0e15804bb38607de73a3
2011-10-05 16:25:11 -07:00
The Android Open Source Project
2c92d46626 Reconcile with ics-factoryrom-release
Change-Id: I656e0ea68c6bf350f391a3922884216955997686
2011-10-05 16:16:03 -07:00
Jeff Brown
4dfce20cac Make SENSOR orientation modes trump rotation lock.
Bug: 5371750

Change-Id: I4d18b6c8ba1de0afd5929ddb8d7123272e35fbe2
2011-10-05 16:12:07 -07:00
Christopher Tate
336a649cd8 Prevent concurrent backup operations
We've seen cases (bug 5417779) where the transport kicked off an immediate
backup operation but then was perfectly content to allow the periodic
timer to start *another* pass concurrently while the first was still in
progress.  This wound up with the backup manager getting mightily
confused and leaking wakelock acquisitions, which is Very Bad(tm).

This patch adds a little bookkeeping so that the backup manager is aware
of backups in flight, and refuses to kick off a new one until the ongoing
one has finished.

Change-Id: If12b54f4db3effc8af36d31c58d8f9b415ddc01e
2011-10-05 16:05:43 -07:00
Roman Nurik
f4b2ba1894 Add ActionBarCompat sample (CL 2 of 2)
Change-Id: Ie64eaad0c5cd148288ee48c524ff3516522fc10f
2011-10-05 15:59:23 -07:00
Richard Ngo
e0696a73ac updated blue border for stackviews to new holo blue
Change-Id: I1dc52fa0b089e52afb2213b106aea049c861c1ea
2011-10-05 15:37:35 -07:00
George Mount
67f9d32e5e Merge "Fix monkey NullPointerException" 2011-10-05 15:33:46 -07:00
Mathias Agopian
1302d32996 Merge "Force a repaint when hwc invalidate hook is called" 2011-10-05 15:09:46 -07:00
Steve Block
518f72ca38 Fix SslError.getPrimaryError() to return -1 if the set of errors is empty
Also fix a couple of buggy asserts.

Bug: 5416594
Change-Id: I0e7e2548886af5fc0b8c20f70a3040d2c5bc68ea
2011-10-05 23:09:23 +01:00
Mathias Agopian
edaab94c2b Force a repaint when hwc invalidate hook is called
without this prepare() would be called but not set() since the
dirty region is empty.

Change-Id: I038acfbdad4c16015357ccde4d1949391d6f989d
2011-10-05 15:00:22 -07:00
Steve Block
cfb753a641 Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision" 2011-10-05 14:56:21 -07:00
Dirk Dougherty
63d8b0c8b5 Merge "Doc change: add diffs for API level 14." 2011-10-05 14:09:49 -07:00
Brian Colonna
fe7fcd23d5 Merge "Added callback for Face Unlock service to poke the wakelock" 2011-10-05 13:58:59 -07:00
Brian Colonna
0c422a72ed Added callback for Face Unlock service to poke the wakelock
Change-Id: I76a4e0f8ac0fe17e39195f4593fac7e36d7281f0
2011-10-05 16:13:18 -04:00
Scott Main
2950b1b234 add spell checker sample to build
Change-Id: Id03246e140ee6676810fcefebff0ba73115987ec
2011-10-05 13:08:18 -07:00
Irfan Sheriff
0f43161150 Add a time threshold for re-enabling networks
Reconnecting to a bad network can be expensive (network down time wise and for the device as well).

Add a minimum threshold.

Bug: 5234206
Change-Id: I5ef1fe06038db73c29a3e95b6229506555f36c77
2011-10-05 12:49:13 -07:00
Steven Ross
94d2f366f9 Merge "Killing Facelock when a phonecall comes in" 2011-10-05 12:46:27 -07:00
Scott Main
5a144de0f8 Merge "docs: add sample spellcheckerservice to resources docs" 2011-10-05 12:26:31 -07:00
Scott Main
c4c541a0da docs: add sample spellcheckerservice to resources docs
Change-Id: I16420a6ade14a7c78f2fa4a6d2a5f6ef6717ac5d
2011-10-05 12:23:04 -07:00
Jason Sams
66fb1f3f3d Merge "Wrapping new API with #defines to prevent old apps from using them." 2011-10-05 12:01:51 -07:00
Nicolas Roard
f270a1521c Merge "Streamline the layers update codepath. Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work." 2011-10-05 11:35:29 -07:00
Richard Ngo
71fa342b3f primary progress updated to fix clipping problem
Change-Id: I98aed6f5f2ca1de31802ca15ad16ae8143142538
2011-10-05 11:31:25 -07:00
Dianne Hackborn
30c845f9ca Turn off logging.
Change-Id: I5b050e33fe918c08b24091c6ccb9c5fe2b01d496
2011-10-05 11:30:55 -07:00
Richard Ngo
140caf5bb7 scrubber assets updated to larger size
Change-Id: Id30d2591a177ca8f5eb5a21dd2880c8183945cd4
2011-10-05 11:28:37 -07:00
Dianne Hackborn
edc633170f Merge "Always unfreeze display." 2011-10-05 11:25:19 -07:00
Dianne Hackborn
01017cdf74 Merge "Some new ICS target SDK changes." 2011-10-05 11:25:02 -07:00
Dianne Hackborn
668f7c3ec9 Merge "Fix issue #5348948: Third Party app "Byki Turkish" shows..." 2011-10-05 11:15:13 -07:00
Steven Ross
dce0bb62ce Killing Facelock when a phonecall comes in
This needs to actively listen for phonecall callbacks,
or calls that come in while Facelock is active will drop.

Change-Id: I818433e5de9085f0357f61d6a04b395e58871396
2011-10-05 13:51:45 -04:00
Andreas Huber
50dabc5f0e Merge "Set crop params to ANative Window during Initialization." 2011-10-05 10:36:20 -07:00
Lakshman Gowda
db62a245f9 Set crop params to ANative Window during Initialization.
The native_window_set_crop() is called when port reconfig event callback comes from decoder's and
crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.
Since the default crop params are same as port reconfig crop params, the native_window_set_crop()
is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).
By calling native_window_set_crop() during initilaization of output port of decoder ensures
in setting up ANative window to crop region.

Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688
Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
2011-10-05 10:29:27 -07:00
Irfan Sheriff
ff1cd56a79 Merge "Handle unexpected interface up/down events" 2011-10-05 10:03:54 -07:00
Steve Block
f219f23aec Fix SslCertLookupTable to correctly determine whether we have a valid cached decision
We should only re-use a cached 'allow' decision if the decision ...
- is for the same host
- is for an error which is at least as severe as the current error

Bug: 5409251
Change-Id: Id8516f58c8d23de44e80539ffeaf945be3d2914a
2011-10-05 18:01:54 +01:00
Steve Block
4198627a28 Merge changes I447cd196,I0c6cdae4
* changes:
  SSL-related cleanup in BrowserFrame and SslCertLookupTable
  Clean up SslErrorHandlerImpl
2011-10-05 10:00:59 -07:00
Steve Block
7897fdd6a6 Merge "Fix BrowserFrame to construct SslError using the full URL, rather than the host" 2011-10-05 09:46:27 -07:00
Joe Fernandez
1d4a25556a Merge "docs: Camera class JavaDoc FixIts for ICS" 2011-10-05 09:23:03 -07:00
Narayan Kamath
b4e7d4ca75 Merge "Allow listeners to be set before the service connects." 2011-10-05 06:52:24 -07:00
The Android Automerger
0a71485079 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-05 06:39:22 -07:00
Steve Block
bf52c0ea10 SSL-related cleanup in BrowserFrame and SslCertLookupTable
- Fix a comment in BrowserFrame.certificate()
- Simplify SslCertLookupTable by not storing 'deny' decisions.
  We only need to store 'allow' decisions, as we don't re-use 'deny' decisions.

No change in behaviour.

Bug: 5409251
Change-Id: I447cd1966fbb6c2dea8088b2e4c4e2de22405cb9
2011-10-05 13:32:32 +01:00
Steve Block
270a3c8062 Clean up SslErrorHandlerImpl
- Use assert rather than junit.framework.Assert
- Add some comments
- There's no need for checkSslPrefTable() to call handleSslErrorResponse() as
  we'll never update the table. Instead call
  LoadListener.handleSslErrorResponse() directly.

No functional change.

Bug: 5409251
Change-Id: I0c6cdae43fa966f86f4a6c43b74c2f2a01f60319
2011-10-05 13:28:28 +01:00
Steve Block
fa03f9a346 Fix BrowserFrame to construct SslError using the full URL, rather than the host
https://android-git.corp.google.com/g/#/c/133348 changed BrowserFrame to
construct the SslError using only the host. This was done so that we match on
just the host component of the URL when re-using previous decisions in case of
an SSL error. It also means that the browser displays only the host when it
shows the SSL error dialog.

This change fixes BrowserFrame to pass the full URL to SslError. We modify
SslCertLookupTable to keep the existing behaviour regarding matching on only the
host component. There's no need to change Browser to continue displaying only
the host as I think this change was an unintentional side-effect.

Also remove dead code-path in BrowserFrame.reportSslCertError(). This
method is used only with the Chromium HTTP stack. This code was added
in https://android-git.corp.google.com/g/#/c/121023.

No functional change.

Bug: 5410252
Change-Id: Ief2dbf4558095fb6fa7ab0caac7d37fa4f640b66
2011-10-05 13:16:17 +01:00
Steve Block
ea54b17038 Merge "Clean up SslError" 2011-10-05 02:28:15 -07:00
Jim Miller
85b10b0dd0 Fix 5317948: Don't display facelock when transport controls are showing.
Change-Id: I0061fa9ec184846b0ed82c977a2e48b36cb079af
2011-10-04 21:14:15 -07:00
Xavier Ducrohet
a11630fc71 Merge "LayoutLib: fix support for textScaleX." 2011-10-04 19:40:23 -07:00
Xavier Ducrohet
d410bfb200 LayoutLib: fix support for textScaleX.
Change-Id: I821191a40012e9727b4a3573d580483c3ae1de48
2011-10-04 19:39:18 -07:00
Romain Guy
ac0757a47c Merge "Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0" 2011-10-04 19:22:41 -07:00
Romain Guy
ed7a8fc768 Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0
This bug was affecting several third party applications. The bug was
introduced by an optimization that prevented the local clip to be
recomputed when needed.

Change-Id: I7b5c464db21b5ff1a7274af75a3a64d0e9d84772
2011-10-04 19:21:27 -07:00
Dianne Hackborn
161dc80ea7 Always unfreeze display.
Change-Id: I7a0f3be49fe723fe59cf6268861bc5fe7f49bc62
2011-10-04 19:18:25 -07:00
Dianne Hackborn
836e262aa8 Fix issue #5348948: Third Party app "Byki Turkish" shows...
...a tiny dialog (works fine in GB and HC)

I found two problems:

- When first binding an application, we were not correctly computing
the compat configuration.
- When retrieving the display metrics to hand to Resources, we were
using the one with compat applied.  This is not right, because
Resources will apply the compat itself, so in some cases the compat
scaling was applied twice.

Change-Id: I22c9cfed9e271290c1a7544fa3ffa54a2e65daf9
2011-10-04 19:17:49 -07:00