60590 Commits

Author SHA1 Message Date
Brian Colonna
93b19cbe4b Merge "Changed result of entering credentials after forgot pattern" 2011-09-23 15:09:15 -07:00
Ben Komalo
3573d400a5 Enter minimal boot mode when booting encrypted
Bug: 5233488
Change-Id: Iba7a41c69af2387594d2be562d587918cd17a348
2011-09-23 15:08:24 -07:00
Adam Powell
e245c11dfb am 6ed1bfb1: Merge "Fix bug 5341139 - bottom bar stays if app wants to handle orientation change"
* commit '6ed1bfb1b68071d64a8ab145cc249d37377f9758':
  Fix bug 5341139 - bottom bar stays if app wants to handle orientation change
2011-09-23 15:07:53 -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
Andreas Huber
bea34b942d Support even more .avi files with .mp3 content not aligned to chunk boundaries
Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d
related-to-bug: 5349382
2011-09-23 14:59:31 -07:00
Dianne Hackborn
0ba3f30655 am a982ad19: Merge "Fix issue #5173952: Opening a Notification From Lock Screen..."
* commit 'a982ad19d2aee54f714fa3ad9ee4ddbac08dc0fe':
  Fix issue #5173952: Opening a Notification From Lock Screen...
2011-09-23 14:56:48 -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
76d4fda68c am 6c984bcb: Merge "Add detail to restorePicture deprecation"
* commit '6c984bcb179c74c2fa3c814596792629d1005355':
  Add detail to restorePicture deprecation
2011-09-23 14:50:39 -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
Eric Laurent
c318cd339b am 65837ced: Merge "Fix issue 5355047: Automated effect tests fail."
* commit '65837cede462b551742f900f2e2f5a1d5dd576a2':
  Fix issue 5355047: Automated effect tests fail.
2011-09-23 14:44:38 -07:00
Eric Laurent
65837cede4 Merge "Fix issue 5355047: Automated effect tests fail." 2011-09-23 14:43:12 -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
Jason Sams
94aaed3846 Remove unused fields in ProgramRaster
Change-Id: I70c9d47674c956ec850c178c7aaa9a5e3dd9dffb
2011-09-23 14:18:53 -07:00
Fabrice Di Meglio
3201668bfd am 651e4667: Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
* commit '651e46679b2d5dc7809fdb2b57e15a9ba2992db4':
  Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits
2011-09-23 14:07:29 -07:00
Svetoslav Ganov
88226bf0da am 83a559e7: Merge "Scroll accessibility events should not populate text."
* commit '83a559e78f57703645066c822a1ec7257c06ba56':
  Scroll accessibility events should not populate text.
2011-09-23 14:07:22 -07:00
Amith Yamasani
7583ac63d7 am e7d70563: Merge "Launch nested preferences with the same theme as parent activity."
* commit 'e7d70563839bbf0ce8d548fe7223229ec2ecd635':
  Launch nested preferences with the same theme as parent activity.
2011-09-23 14:07:19 -07:00
Christopher Tate
a0cd7ad6c6 am 54303e6b: am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
* commit '54303e6b2361e2fbfe889f4464074c89763f7ab1':
  Don't crash during full backup when CheckJNI is enabled
2011-09-23 14:07:16 -07:00
Scott Main
2d31058424 am c86bc42c: Merge "docs: a few additions and revisions to action bar docs"
* commit 'c86bc42cb1b910c1150c8f5aa74c1c160c1359e3':
  docs: a few additions and revisions to action bar docs
2011-09-23 14:07:14 -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
Dianne Hackborn
90c52de286 Fix issue #5173952: Opening a Notification From Lock Screen...
...Should Skip Unsecure Lockscreen (ICS)

Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).

Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
2011-09-23 13:39:33 -07:00
Fabrice Di Meglio
651e46679b Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits" 2011-09-23 13:30:41 -07:00
Svetoslav Ganov
83a559e78f Merge "Scroll accessibility events should not populate text." 2011-09-23 13:26:18 -07:00
Amith Yamasani
e7d7056383 Merge "Launch nested preferences with the same theme as parent activity." 2011-09-23 13:24:38 -07:00
Christopher Tate
54303e6b23 am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
  Don't crash during full backup when CheckJNI is enabled
2011-09-23 13:21:07 -07:00
Christopher Tate
b20d378cec Merge "Don't crash during full backup when CheckJNI is enabled" into ics-factoryrom 2011-09-23 13:19:33 -07:00
Scott Main
c86bc42cb1 Merge "docs: a few additions and revisions to action bar docs" 2011-09-23 13:13:13 -07:00
Christopher Tate
ca1605e6e3 Don't crash during full backup when CheckJNI is enabled
It's not okay to pass null to JNI methods and trust that it will just
back off and return a null result cleanly.  Fixes bug 5361822 .

Change-Id: Id8a17b958fd183d55cb6475f394e158c13aae2ea
2011-09-23 13:12:49 -07:00
Dianne Hackborn
04d98fb638 am 67c5b125: Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly"
* commit '67c5b1251178532726964c2e0f4229d079ff0a3e':
  Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly
2011-09-23 12:58:33 -07:00
Dianne Hackborn
67c5b12511 Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly" 2011-09-23 12:56:42 -07:00
Scott Main
e797ed6a74 docs: a few additions and revisions to action bar docs
Change-Id: I12c24e5d4ed49d8f9822050d330f617bd614b7b9
2011-09-23 12:56:20 -07:00
Brian Colonna
eef1ae1d91 FaceLock is now closed if emergency dial button is pressed
Previously facelock would remain on top of the dial keypad until it
timed out.

Change-Id: Iaf1b3b0040fbfcb5c32e3db7b0466d2a6f89dc1d
2011-09-23 15:52:18 -04:00
Kenny Root
e327fe4611 am 3f816086: Merge "Less verbose message when dexopt non-APK"
* commit '3f8160868003eb2525e5a69ed6b0a1790a30cd1b':
  Less verbose message when dexopt non-APK
2011-09-23 12:51:17 -07:00
Kenny Root
3f81608680 Merge "Less verbose message when dexopt non-APK" 2011-09-23 12:49:44 -07:00
Adam Powell
0cdb24da5b am 90d33ccd: Merge "Remove unnecessary parameter"
* commit '90d33ccd16cf909ac4920a593772204d7bcf45db':
  Remove unnecessary parameter
2011-09-23 12:47:03 -07:00
Adam Powell
90d33ccd16 Merge "Remove unnecessary parameter" 2011-09-23 12:45:13 -07:00
Ben Murdoch
9bb55bf015 Force a WebView pictureset invalidation on screen rotation.
This fixes some stale content issues when rotating the screen.

Bug: 5357237
Change-Id: Ib41a659ec99419cdf94ad5321c224a33b1f21359
2011-09-23 19:59:53 +01:00
Brian Colonna
aae641bc64 Changed result of entering credentials after forgot pattern
After pressing forgot pattern and entering credentials, it used to
bring you to the screen to choose a new pattern.  Now you are brought
to the screen to choose any unlock method.  The reason for this change
is that both Pattern and FaceLock are valid possibilities when a
pattern is forgotten since FaceLock can use a pattern as a backup
method.

Change-Id: Ide28a780771a50952e72c3c06e1f71cbcb48f834
2011-09-23 14:37:11 -04:00
Andreas Huber
6677ea6161 am 7fa3b435: Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
* commit '7fa3b435d67e3ba2c879431f44e262c40716ebd8':
  Add an option to dump the raw stream to a file in the stagefright cmdline tool.
2011-09-23 11:36:49 -07:00
David Brown
812a837bc5 am e45beeb7: Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers."
* commit 'e45beeb7493070f3a2b9ff90f42009288e1372b2':
  Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers.
2011-09-23 11:36:47 -07:00
Adam Powell
4f4b7fbf3c am 5c267ece: Merge "Fix leaky view tags"
* commit '5c267ecec6529a384e76a8b4a261b73aadaf1130':
  Fix leaky view tags
2011-09-23 11:36:31 -07:00
The Android Automerger
6ed59da6ad merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-23 11:35:01 -07:00
Andreas Huber
7fa3b435d6 Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool." 2011-09-23 11:27:51 -07:00
David Brown
e45beeb749 Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers." 2011-09-23 11:25:57 -07:00
Adam Powell
2b2f6d6c54 Remove unnecessary parameter
Change-Id: I32810a31140263a996d4f600fa53db5f29e60f42
2011-09-23 11:15:39 -07:00
Adam Powell
5c267ecec6 Merge "Fix leaky view tags" 2011-09-23 11:05:25 -07:00
Gilles Debunne
945ee9b166 Bug 5250788: TextView gets slower as the text length grows
getSpans was called too many times in handleRun. Pre-compute the
subset of intersected spans and iterate over a subset of it instead.

Moving the instanceof test in getSpans after the other tests also
speeds things up a lot.

On a text with ~300 words, all with a span attached, getSpans went down
from 78% to 14% of the CPU usage.

Change-Id: I59bc44f610e9a548e0dcec68b180934da9e5c559
2011-09-23 11:00:27 -07:00
Amith Yamasani
72e6bece43 Launch nested preferences with the same theme as parent activity.
Bug: 5351628
Change-Id: Id67b81558bc6e010d6f024cdb8117424aa6b62f0
2011-09-23 10:43:40 -07:00
Andreas Huber
a17545339b Add an option to dump the raw stream to a file in the stagefright cmdline tool.
Change-Id: Ie19eca2cdf162d6973037ec554ef5916243ea7d7
2011-09-23 10:25:32 -07:00
Gilles Debunne
186aaf9735 Bug 5248215: Even though I turned off the Spelling correction, it still shows up
Bug 5313754: SpellCheckSession is released when the window loses focus.

When an EditText is initialized with text, a new spell check is initiated
and previous spell check spans are removed.
Requires a new flag to prevent this from happening when the window focus
change comes from the suggestion popup window being shown.

Also fixes bug 5329588: handle spell check language change.

This change has been reverted. This amended change defers the creation
of the SpellChecker, so that it is only created for editable TextView.

Patch 3: Bug 5332065, the spell check session is closed in onDetachedFromWindow, which is
called when the window is destroyed (like on rotation), which was not the case with
onWindowFocusChanged.

Patch 5: Fixed life cycle. A view can be created and never attached to the hierarchy. As
a result, the spellCheck session would not be closed. Moved spell check to onAttach and
perform a spell check when text is changed by setText only if the view has previously
been attached (and the spellChecker has been created).

Change-Id: Ic2cfbfc0d3f23c589dd9e37f02e4afc1d625615d
2011-09-23 10:16:01 -07:00