drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,054 Commits 1 Branch 0 Tags
Commit Graph

59054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
86b734972d Merge "Enforce DUMP permission on BackupManagerService's dump() method" 2011-09-29 17:28:29 -07:00
Romain Guy
638f17c1b7 Merge "TextureView works best when it draws stuff. Bug #5391188" 2011-09-29 17:23:52 -07:00
Romain Guy
59c7f80dd2 TextureView works best when it draws stuff. 
Bug #5391188

Change-Id: I5e754881ccb08ff288ebd60de77282c9cbcf3f86
 2011-09-29 17:21:45 -07:00
Amith Yamasani
966222ef24 Merge "Handle the case of Preference lists that have header views inserted at the top." 2011-09-29 16:48:55 -07:00
Romain Guy
1e70aa94c1 Merge "Add system property to force hw acceleration." 2011-09-29 16:39:16 -07:00
Romain Guy
9622e20486 Add system property to force hw acceleration. 
Change-Id: I538e641435f282b1af20866a8acd1f8d292734c4
 2011-09-29 16:38:24 -07:00
Mangesh Ghiware
293fe94920 Merge "Force a WebView pictureset reset on screen rotation." 2011-09-29 15:57:51 -07:00
Amith Yamasani
2d43d283fc Handle the case of Preference lists that have header views inserted at the top. 
Without this change, wrong Preference is returned when you select one.
Subtract the number of headers from the index before querying the adapter.
Needed for:
Bug: 5203189

Change-Id: Iba7277789ebbd7e3e9954931b1ea06c7e34f3c15
 2011-09-29 15:16:16 -07:00
Christopher Tate
b8491bb75f Enforce DUMP permission on BackupManagerService's dump() method 
The text of the dumped output can potentially include an email address;
we don't want random code to be able to read it.

Bug 5389201

Change-Id: If84886357a36b7015878e4d72017abba83b4c511
 2011-09-29 15:13:11 -07:00
Philip Milne
a15cb2cda7 Merge "Fix for 5393156" 2011-09-29 15:01:27 -07:00
Kenny Root
b1955c96cc Merge "Add package-verifier to aapt dump badging" 2011-09-29 15:00:42 -07:00
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
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
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