59527 Commits

Author SHA1 Message Date
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
Xavier Ducrohet
e5493f3115 Merge "Layoutlib: Typeface support for loading fonts manually." 2011-10-04 19:10:33 -07:00
Xavier Ducrohet
0bb83a2839 Merge "Layoutlib now parses system_fonts.xml instead of its own." 2011-10-04 19:10:13 -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
Dianne Hackborn
59ba98565d Merge "Fix issue #5388352: font size change back to normal" 2011-10-04 18:35:19 -07:00
Xavier Ducrohet
1409409732 Layoutlib: Typeface support for loading fonts manually.
If the font being loaded is a system font, then we can find the font
file and manually load it.

Change-Id: I95473b1f1b88df64316b77c41ed05d4d09ab61ed
2011-10-04 18:24:30 -07:00
Xavier Ducrohet
178006a0e0 Layoutlib now parses system_fonts.xml instead of its own.
Also parse fallback_fonts.
This lets layoutlib automatically use the same fonts as the base
platforms, for instance it now uses the new ICS fonts.

Change-Id: Id6e778dc0e3f2a9112601e0eaf8499a9713ec433
2011-10-04 18:02:10 -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
Fabrice Di Meglio
ad0b051b13 Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
This reverts commit a130e5f59dc6b2117e4c1a8ffef54828e9ea44c7
2011-10-04 17:21:26 -07:00
Dirk Dougherty
d94931ab25 Doc change: add diffs for API level 14.
Change-Id: Ib893a0ce12682fc371b0d90671e10559969ba4bb
2011-10-04 17:20:49 -07:00
Jake Hamby
b7945cae5a Enable support for multiple SMSDispatchers in CDMALTEPhone.
Refactor framework to support multiple SMSDispatcher objects on
dual-mode devices that require support for both 3GPP and 3GPP2
format SMS messages. Each dispatcher registers to receive events for
the appropriate message format.

Note: All applications which handle incoming SMS messages by processing the
SMS_RECEIVED_ACTION broadcast intent MUST pass the "format" extra from the intent
into the new createPdu() method in android.telephony.SmsMessage that takes an
extra format parameter. This is required in order to correctly decode the PDU on
devices which require support for both 3GPP and 3GPP2 formats at the same time,
such as CDMA/LTE devices and GSM/CDMA world phones.

 - moved code to manage device storage events from SMSDispatcher to a
   new class, SmsStorageMonitor, which is shared among all dispatchers.

 - moved code to monitor per-application outgoing SMS usage from
   SMSDispatcher.SmsCounter to a new class, SmsUsageMonitor, which
   is shared among all dispatchers.

 - fixed a bug that prevented CDMALTEPhone from setting the MCC/MNC
   operator numeric value in the telephony provider from the UICC,
   as GSMPhone does, when the SIM records have loaded.

Change-Id: I2789ac07b6ca2948138bca7f75481f9b31514f20
2011-10-04 17:16:06 -07:00
Svetoslav Ganov
63f5e09c8c Merge "Make prompt for headset while typing a password if accessibilbity is on less verbose." 2011-10-04 17:14:57 -07:00
Scott Main
df5d7c882c Merge "adding Android Beam sample" 2011-10-04 17:09:38 -07:00
Robert Ly
d8afdb49ff adding Android Beam sample
Change-Id: I30df24bc41fe61ebaab29f23a8df54f2c9599394
2011-10-04 17:07:06 -07:00
Svetoslav Ganov
bd39ca7014 Make prompt for headset while typing a password if accessibilbity is on less verbose.
If accessibility is enabled and there is no headset we do not speak the pressed keys.
In such a case we provide a prompt to the blind user to use a headset. This was announced
on every keypress which is quite annoying. Now this is announced only once.

bug:5342234

Change-Id: Ibe55ad991ad2153d09cde57b030544948fa0d73b
2011-10-04 17:05:55 -07:00
Irfan Sheriff
56379d2397 Handle unexpected interface up/down events
WEXT on crespo has an issue where the interface up/down events
can happen in an unexpected fashion.

At a driver start, we can go from interface disabled to interface enabled,
back to interface disabled and then eventually into an interface enabled state.

Earlier, we were just expecting a single interface enable event that would trigger
driver specific commands. Now, we just handle these events as individual driver
stop and driver start situations so that we do appropriate things eventually

Bug: 5239853
Change-Id: I6bd5d844edf9fadfdca4e8eb753c2ba738aa6ad5
2011-10-04 16:59:10 -07:00
Joe Fernandez
464cb21e2a docs: Camera class JavaDoc FixIts for ICS
Change-Id: I03d96247d149baf82c53b33aa7737fca11906ce6
2011-10-04 16:56:47 -07:00
Dianne Hackborn
09e5b9daf3 Fix issue #5388352: font size change back to normal
This is another place where we are messed up by the stupid default
Configuration having a 1.0 font scale.  Argh.

Change-Id: Iaa2550d4edab92fb8a52f98fbb9fd8ef5fab94b5
2011-10-04 16:32:01 -07:00
Dave Santoro
53902603a4 Merge "Fix permission strings to match ICS-FactoryROM." 2011-10-04 16:19:27 -07:00
Dave Santoro
873aeb0f8a Fix permission strings to match ICS-FactoryROM.
Bug 5394200

Change-Id: I2c6de49247c12d56d04304264dc7694987e4d28e
2011-10-04 16:16:57 -07:00
Christopher Tate
b5de598554 Merge "Add -nosystem flag to adb backup" 2011-10-04 16:16:11 -07:00
Jason Sams
3c1951c442 Merge "Fix crash running old HC apps." 2011-10-04 15:53:37 -07:00