26107 Commits

Author SHA1 Message Date
Jeff Sharkey
ad9c5718da am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
* commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf':
  Hide quota APIs until finalized.
2011-10-06 11:22:40 -07:00
Jeff Sharkey
a50d0f8985 Merge "Hide quota APIs until finalized." into ics-factoryrom 2011-10-06 11:19:29 -07:00
Jeff Sharkey
44a3e0d497 Hide quota APIs until finalized.
Bug: 5383656
Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612
2011-10-06 10:50:09 -07:00
Steve Block
1672124255 Merge "Improve a warning message in WebViewCore's EventHub" 2011-10-06 10:35:33 -07:00
Eric Fischer
2fc826ec94 Import translations for late permission additions.
Change-Id: I80c968b0f6fd74cc52443a3729d02490c77aef30
2011-10-06 10:28:28 -07:00
Ben Murdoch
923154914d Merge "Pass correct units for text size in autocomplete drop down." 2011-10-06 10:23:20 -07:00
John Reck
68b9074a60 Merge "Prevent adapter flickering" 2011-10-06 10:22:03 -07:00
Steve Block
3475ebfab2 Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty" 2011-10-06 08:48:52 -07:00
Justin Ho
11a670531f Merge "primary progress updated to fix clipping problem" 2011-10-06 07:39:11 -07:00
Justin Ho
ab72e95ed3 Merge "scrubber assets updated to larger size" 2011-10-06 07:39:03 -07:00
Steve Block
7b65a3eb29 Improve a warning message in WebViewCore's EventHub
These warnings appear occasionally and this will help track them down.

Also removes an unused method.

Bug: 5421676
Change-Id: I5ba3f146449623e3457aafc91fd2e7edc367a9d9
2011-10-06 14:54:31 +01:00
Luca Zanolin
535698c57d Remove the mic from the keyboard in SearchView
Bug: 5357750
Change-Id: I20c87a25e95222772c6b5154d09dd681b966fd9a
2011-10-06 13:36:15 +01:00
Ben Murdoch
f88a56e2b1 Pass correct units for text size in autocomplete drop down.
We need to set the size of the text used in the autocomplete
drop down in pixels, as we do when setting the size of the
EditText itself.

Bug: 5420125
Change-Id: Ife6d8c108c57106ffaa8706fa9e4e537a73a1733
2011-10-06 12:10:31 +01:00
Jeff Sharkey
ca35bc5acc Merge "Refine random stats generation." 2011-10-05 23:38:44 -07:00
Jeff Sharkey
293779f9c6 Refine random stats generation.
Offer parameters to pick out specific list of packages, and to change
duration and total data.

Bug: 5416742
Change-Id: I6970a5e76f3198ef23a400c079037212b000ca6b
2011-10-05 23:31:57 -07:00
Jim Miller
22f3d9fab0 Merge "Fix 5396647: Move lock slider up by 10dip on lock screen." 2011-10-05 19:08:28 -07:00
John Reck
a607060bbd Prevent adapter flickering
Bug: 5403763
 Prevent rapidly switching between a null adapter and a valid
 adapter by only clearing if the node pointer changes or the text view
 is no longer autocompletable.

Change-Id: Ie594396db807b5ad5e1a5a0e68ec0c7677364aaf
2011-10-05 18:26:57 -07:00
Jim Miller
f67f8b4ee4 Fix 5396647: Move lock slider up by 10dip on lock screen.
Change-Id: I32d5b8bc784e2171b4880c08eeabfda7c58238db
2011-10-05 18:12:04 -07:00
Christopher Tate
ad9e8b1a87 Disable db_sample logging
db_sample logging is thrashing the event log hard, and is currently
neither maintained nor heeded by anybody on the current release.  It
can be re-enabled simply by throwing the appropriate static boolean
to 'true', but for now this should greatly improve the utility of our
event logs.  (We were seeing a rollover period of 20 minutes or less;
ideally we want to see the event log run at least half a day before
rolling.)

Bug 5419627
Bug 5104300

Change-Id: I2125544130aae142974102dbad3b557e49fcd494
2011-10-05 17:49:26 -07:00
Jeff Brown
219f3c7126 Merge "Make SENSOR orientation modes trump rotation lock. Bug: 5371750" 2011-10-05 17:24:29 -07:00
Richard Ngo
39382aa77a Merge "updated blue border for stackviews to new holo blue" 2011-10-05 17:23:33 -07:00
Fabrice Di Meglio
610c2d25ed Merge "Fixbug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-10-05 17:12:17 -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
Jeff Brown
4dfce20cac Make SENSOR orientation modes trump rotation lock.
Bug: 5371750

Change-Id: I4d18b6c8ba1de0afd5929ddb8d7123272e35fbe2
2011-10-05 16:12:07 -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
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
Steve Block
cfb753a641 Merge "Fix SslCertLookupTable to correctly determine whether we have a valid cached decision" 2011-10-05 14:56:21 -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
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
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
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
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
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
Danielle Millett
af1ef9ed03 Merge "Adding a flag for if biometric weak has ever been used" 2011-10-04 18:44:55 -07:00
Danielle Millett
7a07219a1f Adding a flag for if biometric weak has ever been used
This flag will be used to show a tutorial screen first time it is used.
The flag is set to true once facelock has been set (via the savePassword or
savePattern when in fallback mode)

Change-Id: I43e3f876810fd32d3d5a5a285201e8054c4b3098
2011-10-04 21:01:52 -04:00
Nicolas Roard
dc221e01ff Streamline the layers update codepath.
Directly update the layers transform and position.
This makes updates faster and less dependent on other webkit work.

bug:5218173
Change-Id: I5f784ef64eda1be3cee406aa23702e5378c8de9e
2011-10-04 17:57:59 -07:00
Fabrice Di Meglio
e921572bda Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"" 2011-10-04 17:24:37 -07:00