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
Brian Colonna
93b19cbe4b
Merge "Changed result of entering credentials after forgot pattern"
2011-09-23 15:09:15 -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
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
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
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
Kenny Root
3f81608680
Merge "Less verbose message when dexopt non-APK"
2011-09-23 12:49:44 -07:00
Adam Powell
90d33ccd16
Merge "Remove unnecessary parameter"
2011-09-23 12:45:13 -07: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
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
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
Eric Laurent
5e7acae2c3
Fix issue 5355047: Automated effect tests fail.
...
Fixed several regressions in automated audio effect tests due
to changes in effect framework and visualizer FFT output range.
- Do not suspend Volume effect on session 0 when effects are
enabled on specific sessions.
- Adapt energy detection thresholds to new visualizer FFT range.
- Leave more time for BassBoost and Virtualizer effects to ramp up
before measuring the effect.
- Removed second insert reverb left by mistake on the player session
in preset reverb test.
Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
2011-09-23 10:15:05 -07:00
Kenny Root
fec5e75c96
Less verbose message when dexopt non-APK
...
The message when something is not an APK that is submitted for dexopt is
not extremely helpful. Make it more precise and remove the useless
traceback.
Change-Id: Ibb34b2b2c10ee28ea98662c3f6fd070529cf8c4f
2011-09-23 10:13:06 -07:00
Wei Huang
e448f557f6
am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
...
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
Update camera javadoc about AE and AWB lock.
2011-09-23 10:05:22 -07:00
Wei Huang
3d9a9e55df
Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
2011-09-23 10:04:02 -07:00
Eric Fischer
ec26232d70
am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom
...
* commit 'c4517842ee2a641342f151ecafb797080b9ed84d':
Delete translations of files that no longer exist.
2011-09-23 09:45:50 -07:00
Eric Fischer
c4517842ee
Merge "Delete translations of files that no longer exist." into ics-factoryrom
2011-09-23 09:43:55 -07:00
Daniel Sandler
a8c46b1dc4
Merge "Put the correct background behind largeIcons."
2011-09-23 09:33:18 -07:00
John Reck
2df8f425f6
Add detail to restorePicture deprecation
...
Bug: 5361506
Change-Id: I4bf6583170df50b218051f4700700ff1b8874d17
2011-09-23 09:27:01 -07:00
Pannag Sanketi
91d3413790
am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
...
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
2011-09-23 09:08:11 -07:00
Pannag Sanketi
1d71c7b40a
Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
2011-09-23 09:06:55 -07:00
Wei Huang
4cd34752cb
am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
...
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
Clear callbacks in camera stopPreview.
2011-09-23 08:33:46 -07:00
Wei Huang
5d87227bad
Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
2011-09-23 08:30:32 -07:00
Brandon Keely
c56c92013c
Merge "Make LockScreen ping() on a miss."
2011-09-23 07:46:30 -07:00
Justin Ho
092c339ae7
am a780fb8e: Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom
...
* commit 'a780fb8e22d72b3f2c09b16eeddeff30e417ee3c':
Updating ellipsis in Roboto Bug: 5344295
2011-09-23 07:30:18 -07:00
Justin Ho
a780fb8e22
Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom
2011-09-23 07:28:31 -07:00
Justin Ho
16faafb493
Updating ellipsis in Roboto
...
Bug: 5344295
Change-Id: Ia885ff39da0609f51863665125bae3a1024e161c
2011-09-23 07:27:35 -07:00
Chih-yu Huang
664d72e663
Clear callbacks in camera stopPreview.
...
Clear those callbacks to remove the references
so the memory can be recycled.
bug:5358774
Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
2011-09-23 20:28:28 +08:00
Peter Ng
b48ca1f1ab
am dd33bf0e: Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom
...
* commit 'dd33bf0ebbde9aa702d039b6b9d5f06ac0a69dfb':
Fix 5355659: Minor tweak to wave ping radius in MultiWaveView.
2011-09-22 23:40:06 -07:00
Robert Greenwalt
511ecc8cf9
am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom
...
* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
Tell the resolver what protocols to use.
2011-09-22 23:39:53 -07:00
Justin Ho
006dc043f0
am 4dfe8695: Merge "CAB assets" into ics-factoryrom
...
* commit '4dfe869520b83b79cc5912f5bd0061b0ec33aa11':
CAB assets
2011-09-22 23:39:51 -07:00
Justin Ho
64edbc3093
am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom
...
* commit '777163e0466bda76d64809b5fd6a1a688de67099':
Updated emergency icon on lockscreen
2011-09-22 23:39:49 -07:00
John Wang
5298a8c71a
am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom
...
* commit 'dd6d1bbd15c4e5cf1b3e0ac34c96f29fb04863c6':
Update PUK unlock screen.
2011-09-22 23:39:37 -07:00
Adam Cohen
a0c7a5765d
am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom
...
* commit '08ee7fa463aee5e83f77789e9a99f17a34ab68b4':
Fixing emergency dialer flicker on lock screen (issue 5314293)
2011-09-22 23:39:33 -07:00