59042 Commits

Author SHA1 Message Date
Kenny Root
b1955c96cc Merge "Add package-verifier to aapt dump badging" 2011-09-29 15:00:42 -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
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
Marco Nelissen
ee1d541ec8 Merge "Use SoundPool instead of Ringtone." 2011-09-29 13:13:17 -07: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
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
Lorenzo Colitti
805f43cd0d Merge "Revert "Tell the resolver what protocols to use."" 2011-09-29 10:52:28 -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
Dianne Hackborn
1fd6c33620 Fix issue #5312624: Lock screen very flickery
The key thing was to fix isVisibleOrBehindKeyguardLw() so that it
wouldn't count a window as not visible if it was just currently
in the process of drawing due to an orientation change.

Also improve logic in deciding when to turn screen on to better ensure
the screen is in a stable state, in particular treating screen off
as a frozen screen and not allowing it to turn on until the
update of the screen due to any config change is done.

Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
2011-09-28 19:46:39 -07:00
Dianne Hackborn
6ea4da95d9 Fix issue #5242779: Device not responding to touch on unlock screen
Rework how we decide when it is okay to turn on the screen by having
the policy call back to the power manager when it knows the lock screen
has been drawn.

Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
2011-09-28 19:46:34 -07:00
Svetoslav Ganov
a53d19dc6d Merge "Revamping of the NumberPicker widget for improved usablility." 2011-09-28 19:43:55 -07:00
Adam Powell
28bbc8254f Merge "Fully qualify javadoc links and make the tools happy" 2011-09-28 18:59:26 -07:00
Adam Powell
2fcbbd0363 Fully qualify javadoc links and make the tools happy
Change-Id: I2ad839be71b550a2bcfb90f67627afdd10d3ae14
2011-09-28 18:56:43 -07:00
Brian Colonna
a50d662552 Merge "Fix 5385186 - Face Unlock no longer shown when first booted" 2011-09-28 18:56:08 -07:00
Romain Guy
f678dd56a7 Merge "Don't build display lists for views with a layer." 2011-09-28 18:27:13 -07:00
Chet Haase
a79803c092 Fixed ProgressBar logic for AnimationDrawables
There are problems in ICS using custom ProgressBar indeterminate drawables when
those drawables are AnimationDrawables. Code that determines appropriate aspect-ratio
sizing should not kick in for this case; the animation drawables know what size
they should be.

Change-Id: I7c35e0dc0f2719f698551f197c688e6156a3f5bd
2011-09-28 17:51:53 -07:00
Eric Fischer
f865f16b6d am d908b40d: (-s ours) Merge "Import revised translations." into ics-factoryrom
* commit 'd908b40d0b0ed1e7e0b0f41e5060a26465b5cb99':
  Import revised translations.
2011-09-28 17:39:35 -07:00
Eric Fischer
d908b40d0b Merge "Import revised translations." into ics-factoryrom 2011-09-28 17:35:18 -07:00