Philip Milne
4a145d7262
Fix for 5393156
...
. Fix for the above.
. Make instances of Space invisible by default.
. Correctly accomodate parental constraints when row/col order is undefined.
This fix allows GridLayout to accomodate simple dependencies between
its axes. In the example given in bug 5393156, the presence of a
multi-line TextView means that GridLayout can only compute its height
after it has computed its width. This fix adds a second measurement pass
to GridLayout that passes infomation betwen the axes, using the GridLayout's
orientation property to indicate which axis should be examined first.
Change-Id: I90761c6fcfe8edc7ef6d9a89076fd5cda3adc0a4
2011-09-29 14:48:44 -07:00
The Android Open Source Project
a44ad813aa
Reconcile with ics-factoryrom-release
...
Change-Id: Iec5fbc58aa0d892e8fe3767aad9de7726ec0aa12
2011-09-29 14:24:50 -07:00
Roman Nurik
99ba69defb
Merge "Add 'updated' banner in guide TOC for media formats, rename Widgets design guide to App Widgets design guide"
2011-09-29 14:10:07 -07:00
Dima Zavin
9d1287019a
am e8b7f4a2: eventhub: print debugginf info when removing device
...
* commit 'e8b7f4a20c43d8f55d0cf85a94363b764ba598b8':
eventhub: print debugginf info when removing device
2011-09-29 14:06:38 -07:00
Mark Wagner
77e6a55f2f
bugfix 5381702 MMS app puts temporary files on sdcard in wrong location
...
move this code into the app
Change-Id: Ieca6c603ee1163524ddb855800ade5e5a8fff0e5
2011-09-29 13:58:59 -07:00
Kenny Root
56088a55ca
Add package-verifier to aapt dump badging
...
Print out the package-verifier information when printing out badging.
Change-Id: I9c79c163261d5d4f1094bda76d90b3ff6e1ce540
2011-09-29 13:49:48 -07:00
Mangesh Ghiware
e8b05e858a
Force a WebView pictureset reset on screen rotation.
...
This fixes some stale content issues when rotating the screen.
Bug: 5357237
Bug: 5361852
Change-Id: I574dac15dbb1a35a8830377848f38ba2b766f095
2011-09-29 13:41:34 -07:00
Marco Nelissen
ee1d541ec8
Merge "Use SoundPool instead of Ringtone."
2011-09-29 13:13:17 -07:00
Steven Ross
329979c9e6
calling back SetupFaceLock to clean up temporary gallery
...
This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
If canceled, the temporary gallery is deleted
Also deletes the main gallery if the lock type is changed from facial recognition
Change-Id: Id1ce804dec6b71b6410af53c050ad265c4cad5b0
2011-09-29 16:00:59 -04:00
Marco Nelissen
d5545bd0a9
Use SoundPool instead of Ringtone.
...
The lock screen was using Ringtone for the lock/unlock sounds, which
meant two new MediaPlayers were created every time a sound needed to
be played. In addition, the Ringtone was assigned to a local variable,
which means it could go be garbage collected and finalized while it
was still playing.
For short sounds that need to be played repeatedly, SoundPool is a
better option anyway, so use that instead.
b/5382634
Change-Id: I8794cbb24604fa7c03032bd5e32ceab37a858054
2011-09-29 12:52:04 -07:00
Daniel Sandler
9ee9dcd256
Bring back nyandroid ADB icon.
...
Change-Id: Ic1124ef985aa8b7912499b7ff1c150fe982b882d
2011-09-29 15:50:12 -04:00
Daniel Sandler
4222c2ef91
Add carrier info back to notification drawer.
...
Bug: 5250214
Change-Id: I9ef1faf052ea6e4d3bd0b5a1a6e67a18fb923c47
2011-09-29 15:44:34 -04:00
Fabrice Di Meglio
a130e5f59d
Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
...
- make DynamicLayout honor max lines
- make StaticLayout.generate() take maxLines as a parameter instead of using the field mMaximumVisibleLineCount
Change-Id: I9eafb1be4b8bb2aa881514955a6903f559cb6a1e
2011-09-29 12:44:16 -07:00
Mike Cleron
2d56123b11
Merge "Fix lockscreen Bug: 5391404"
2011-09-29 12:36:55 -07:00
Justin Ho
b9a4b3c18a
Fix lockscreen
...
Bug: 5391404
Change-Id: I021a37705b72ab1990f7651fecbe743a8af4e372
2011-09-29 12:33:28 -07:00
Daniel Sandler
3d0d7b4172
Merge "Increase padding in notifications."
2011-09-29 11:57:23 -07:00
Dianne Hackborn
03476d7a57
am 9547d03e: Fix build.
...
* commit '9547d03ef1228406ad4eb6db31dbcf58be1e4655':
Fix build.
2011-09-29 11:53:32 -07:00
Dianne Hackborn
e3206c1603
am 1fd6c336: (-s ours) Fix issue #5312624 : Lock screen very flickery
...
* commit '1fd6c33620171893b2e92c38b731fd89e5a8dd66':
Fix issue #5312624 : Lock screen very flickery
2011-09-29 11:53:31 -07:00
Daniel Sandler
0e6d751e6a
Increase padding in notifications.
...
Bug: 5388349
Change-Id: I2649826a7244872bf0ebf1688ac695f38c6c2edf
2011-09-29 14:48:43 -04:00
Roman Nurik
76175764f7
Add 'updated' banner in guide TOC for media formats, rename Widgets design guide to App Widgets design guide
...
Change-Id: Ie84a534f9893b773342c63e260774f26d9353b40
2011-09-29 11:35:13 -07:00
Dima Zavin
e8b7f4a20c
eventhub: print debugginf info when removing device
...
Change-Id: I40bbbd3867e8c7ac7d6fb38e1c72432bb4963316
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-29 11:28:17 -07:00
Kenny Root
3abd75ba3a
Add DUMP permission checks to services
...
Some services have info that is not readily available any other way. Add
a permission check to those services.
Bug: 5389201
Change-Id: I5a9724ec89e1c11ef7813eeb52a6a05b3ea92af5
2011-09-29 11:04:15 -07:00
Gilles Debunne
1dd7e534e7
Bug 5384535: Underline for typo even if there are no suggestions
...
Change-Id: I63f78227a3a80c5fdb97b1d5d8d6c595a70e1990
2011-09-29 10:59:59 -07:00
Gilles Debunne
cf68fee06d
Bug 5254884: suggestions are no logner copied in the clipboard
...
Change-Id: I621c5b4da4252876b0f424e895a4e19e2a4dda50
2011-09-29 10:56:18 -07:00
Lorenzo Colitti
805f43cd0d
Merge "Revert "Tell the resolver what protocols to use.""
2011-09-29 10:52:28 -07:00
Gilles Debunne
e670101db8
Bug 5384675: Color in add to dictionary
...
Change-Id: Ibb89265a90d6b598927dec2bcf45a8c02388b5f0
2011-09-29 10:33:19 -07:00
Dianne Hackborn
1c6ac4eb5c
am 6ea4da95: (-s ours) Fix issue #5242779 : Device not responding to touch on unlock screen
...
* commit '6ea4da95d9093dbfabe79321087b81cd7fbf5e84':
Fix issue #5242779 : Device not responding to touch on unlock screen
2011-09-29 10:21:27 -07:00
Gilles Debunne
404c8e5764
Merge "Bug 5278473 & 5278471: delete option in suggestion popup menu"
2011-09-29 10:21:18 -07:00
Gilles Debunne
f4314dffbd
Merge "Too many SpellCheckSpans are created."
2011-09-29 10:20:46 -07:00
Guang Zhu
2452ad3028
Merge "Revert "log stack trace when finish() or onDestroy() is called""
2011-09-29 10:14:27 -07:00
Marco Nelissen
d94a7b60cc
Merge "Release MediaPlayer before letting it go out of scope."
2011-09-29 10:11:34 -07:00
Marco Nelissen
e1bd048cf2
Release MediaPlayer before letting it go out of scope.
...
Change-Id: Ib2b727146f6cba91b131e66d218251f5a3206fac
2011-09-29 09:59:03 -07:00
Jean-Michel Trivi
cc3fbb7b69
Merge "Fix bug 5357295 NPE on display when remote control client dies"
2011-09-29 09:09:37 -07:00
Justin Ho
b9c13d091e
Merge "Re-adding missing lockscreen drawable"
2011-09-29 08:58:50 -07:00
Justin Ho
aebd1e0823
Re-adding missing lockscreen drawable
...
Change-Id: I895b36b77ea35ffacdfe4a2b9b4c58de9bd01472
2011-09-29 08:53:45 -07:00
Chet Haase
253f694981
Merge "Fixed ProgressBar logic for AnimationDrawables"
2011-09-29 07:47:16 -07:00
The Android Automerger
7a9eb86c9e
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 06:29:20 -07:00
Steve Block
29af074436
Merge "Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread"
2011-09-29 04:09:45 -07:00
Luca Zanolin
83e8ced91a
Merge "Change the width of the suggestion item to match the one of the suggestion pop-up"
2011-09-29 01:09:47 -07:00
Adam Powell
636da63854
Merge "Fix bug 5385274 - tabs in browser can't be scrolled"
2011-09-28 23:51:50 -07:00
Adam Powell
f6a6c97062
Fix bug 5385274 - tabs in browser can't be scrolled
...
Fix a regression related to optimizing invalidation in scrolling
views.
Change-Id: I6a39075dc830d78436a274935a904a32084defac
2011-09-28 23:48:10 -07:00
Lorenzo Colitti
c1358b240c
Revert "Tell the resolver what protocols to use."
...
Change Ife82a8d8 broke IPv6 on wifi. Change I4e3a69ea is
an alternate approach that does not require any framework
changes.
Bug: 5284168
Change-Id: Ib6e002aa23700adc71051cf6b76860545497dbf4
2011-09-28 23:07:03 -07:00
Adam Powell
8f84765385
Merge "Fix bug 5386915 - Action mode is intercepting touches it shouldn't be"
2011-09-28 22:47:08 -07:00
Chih-Chung Chang
bdb38c14b9
Merge "Fix 5389072: NPE in MediaController.updateFloatingWindowLayout()."
2011-09-28 22:14:06 -07:00
Adam Powell
e0b6cd14ac
Fix bug 5386915 - Action mode is intercepting touches it shouldn't be
...
Standalone action mode windows should not be touch modal.
Change-Id: Ia3bab69b3ac344837093a17c4b58451bcc3471bf
2011-09-28 22:06:39 -07:00
Chih-Chung Chang
02dd17da36
Fix 5389072: NPE in MediaController.updateFloatingWindowLayout().
...
There was another constructor which we didn't add the call to
initialize the layout.
Change-Id: I1519c9afd7d6333736fe19d256f55a2f4cdc60c3
2011-09-29 12:49:04 +08:00
Scott Main
43e7972f41
Merge "docs: add some more info to Time javadocs"
2011-09-28 21:48:41 -07:00
Scott Main
31e04656e7
docs: add some more info to Time javadocs
...
Change-Id: I3c5ca668acda734f8a0da0ffbbc1bfa77ed72c2a
2011-09-28 21:36:51 -07:00
Dianne Hackborn
9547d03ef1
Fix build.
...
Change-Id: Ife2b4b207270f8017d3acd80c76eaf1c7a50986d
2011-09-28 20:48:41 -07:00
Guang Zhu
c5daa17928
Revert "log stack trace when finish() or onDestroy() is called"
...
We are already clear on why it's happening (phantom touches) so reverting this log.
This reverts commit 0882eb05af02616cac5cfd82d9039c9e18d029d8
2011-09-28 20:06:56 -07:00