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

35369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
7d5411fd3f Merge "Fix race condition in resize that was created when GetType for allocation and Types became async." 2010-11-01 16:13:55 -07:00
Dan Bornstein
30ce36ec70 am ab1b304b: am ccb75a88: Merge "Update the API file." into gingerbread 
* commit 'ab1b304bd4cf0bb6473b21d5604596105b794362':
  Update the API file.
 2010-11-01 16:12:38 -07:00
Dan Bornstein
ab1b304bd4 am ccb75a88: Merge "Update the API file." into gingerbread 
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
  Update the API file.
 2010-11-01 16:09:44 -07:00
Jason Sams
d26297fa56 Fix race condition in resize that was created when 
GetType for allocation and Types became async.

Change-Id: Ie7036f9481cececf9565d30b25be82480f176ff2
 2010-11-01 16:08:59 -07:00
Dan Bornstein
ccb75a882f Merge "Update the API file." into gingerbread 2010-11-01 16:08:14 -07:00
Joe Malin
1b6334b8bd Merge "Doc Change: Documentation for MonkeyRunner tool" 2010-11-01 16:06:19 -07:00
Scott Main
6034ae6b97 am e06bdead: am fea07c60: am eda78cea: docs: update dashboard 
* commit 'e06bdead5decc26c7fd7ed9b10ad0f009e14d274':
  docs: update dashboard
 2010-11-01 16:03:14 -07:00
Scott Main
e06bdead5d am fea07c60: am eda78cea: docs: update dashboard 
* commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
  docs: update dashboard
 2010-11-01 16:00:43 -07:00
Gloria Wang
f0be6aa771 Merge "Media scanner support for FL(Forward Lock) DRM file types" 2010-11-01 15:57:47 -07:00
Scott Main
fea07c6096 am eda78cea: docs: update dashboard 
* commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83':
  docs: update dashboard
 2010-11-01 15:57:38 -07:00
Chris Tate
e833710e68 Merge "Don't crash bmgr if there are no available restore sets" 2010-11-01 15:53:45 -07:00
Chris Tate
7a0fc87767 Don't crash bmgr if there are no available restore sets 
Properly guard against a null set of available restore sets when
validating the token passed to 'bmgr restore TOKEN' against what's
known to exist on the backend.

Fixes bug 3153986

Change-Id: I74bdd4c6242f682833c1633baa4fefccb2b165a7
 2010-11-01 15:50:35 -07:00
Leon Scroggins
03476ddba6 Merge "Merge commit '55381217' into manualmerge" 2010-11-01 15:16:24 -07:00
Jeff Brown
fe17625238 Merge "Fix policy issues when screen is off." 2010-11-01 15:13:10 -07:00
Jason Sams
d238beb395 Merge "Add code to mark functions rather than whole files as threadable." 2010-11-01 15:10:09 -07:00
Scott Main
eda78ceaff docs: update dashboard 
Change-Id: Icf0c2076484f4aed2d3bf3fc24b751e14eeeafe1
 2010-11-01 15:10:06 -07:00
Jaikumar Ganesh
153541e906 Merge "Disconnect PAN and Input devices on BT disable." 2010-11-01 15:06:05 -07:00
Jaikumar Ganesh
7a0f816916 Disconnect PAN and Input devices on BT disable. 
Also, add a missing break.

Change-Id: I228f80a4223de20e60d2f3828e3f63bdc14f5afc
 2010-11-01 15:04:06 -07:00
Adam Powell
2c3c7dc45d Merge "Fix a find and replace bug in Theme.IconMenu" 2010-11-01 15:02:13 -07:00
Leon Scroggins
c826a69355 Merge commit '55381217' into manualmerge 
Conflicts:
	core/java/android/webkit/WebView.java

Change-Id: I1e93881a55c1d81c1142db03498c68196649b69c
 2010-11-01 18:00:55 -04:00
Adam Powell
86d45adbd7 Fix a find and replace bug in Theme.IconMenu 
Change-Id: I61d435b4d9b31e5bf0c04c21f5af81930a7731b0
 2010-11-01 15:00:50 -07:00
Jeff Brown
4d396052de Fix policy issues when screen is off. 
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
  is not showing (the proximity sensor turned off the screen).
  Previously we passed all non-wake keys through in this case which
  caused a bug on Crespo where the screen would come back on if a soft key
  was held at the time of power off because the resulting key up event
  would sneak in just before the keyguard was shown.  It would then be
  passed through to the dispatcher which would poke user activity and
  wake up the screen.
- We propagate the key flags when broadcasting media keys which
  ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released.  This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Fixed a couple of issues where media keys were being handled inconsistently
or not at all, particularly in the case of the new PAUSE, PLAY
and RECORD keys.

Bug: 3144874
Change-Id: Ie630f5fb6f128cfdf94845f9428067045f42892c
 2010-11-01 15:00:25 -07:00
Dianne Hackborn
487d958663 Merge "Various PreferenceActivity and related improvement." 2010-11-01 14:54:32 -07:00
Leon Scroggins
553812178a am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread 
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
  Update insertion handler for WebTextView.
 2010-11-01 14:51:00 -07:00
Winson Chung
ae61598131 Adding more exception handling to RemoteViews calls to startIntentSender 
Change-Id: I03d7b48813aaf7f94785389c2838d68b0ba913d3
 2010-11-01 14:50:20 -07:00
Leon Scroggins
3073646f61 Merge "Update insertion handler for WebTextView." into gingerbread 2010-11-01 14:49:47 -07:00
Dianne Hackborn
8eb2e244f9 Various PreferenceActivity and related improvement. 
This is all about making the preferences implementation better.

Well, mostly all about that.

Change-Id: I8efa98cb5680f3ccfa3ed694a1586de3fb3a9e11
 2010-11-01 14:48:34 -07:00
Wink Saville
58954d299c Merge "Add PhoneStateListener.onOtaspChanged." 2010-11-01 14:47:38 -07:00
Jason Sams
5060309f4c Merge "Remove excessive logging." 2010-11-01 14:28:57 -07:00
Jason Sams
8f0adba7cb Add code to mark functions rather than whole files as threadable. 
Change-Id: Ie635fbbb96b8ade48501ec564fe135edc256537d
 2010-11-01 14:26:30 -07:00
Vasu Nori
71b8c23e56 add NOTIFICATION_CLICK_ constants to DownloadManager 
DownloadReceive in packages/providers/Downloadproviders sends intents
when notification messages are clicked on.
When using public API of DM, added code to include download entry ids
to the above intents. The constants added here support that code.
intents when

Change-Id: Ibe53ccd9934c73175459e42e3d417eee69ae6735
 2010-11-01 14:21:08 -07:00
Dan Bornstein
bc19c7bdc0 Update the API file. 
My previous change was api-compatible, but some of the incidental data
in the API file (like parameter names) changed. It looks like there
were probably a couple other similar changes too, that hadn't
previously been propagated to the API file; all I did to generate this
change was say "make update-api".

Change-Id: I427a9ceb51212fde515df007613b8687b7228ce7
 2010-11-01 14:14:37 -07:00
Gloria Wang
5d143ad4a8 Media scanner support for FL(Forward Lock) DRM file types 
Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
 2010-11-01 14:08:39 -07:00
Chet Haase
e58a5ad04b Merge "Performance optimizations for animations and toolkit" 2010-11-01 13:53:31 -07:00
Jean-Baptiste Queru
63f366978e am 41c73884: am 5b4d0e84: Merge "TabWidget orientation" 
* commit '41c738849c1fdf29357048ec9f5e48143dbb026a':
  TabWidget orientation
 2010-11-01 13:33:46 -07:00
Jean-Baptiste Queru
41c738849c am 5b4d0e84: Merge "TabWidget orientation" 
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
  TabWidget orientation
 2010-11-01 13:30:49 -07:00
Jean-Baptiste Queru
5b4d0e84d3 Merge "TabWidget orientation" 2010-11-01 13:19:02 -07:00
Joe Malin
9a7eab8d0a Doc Change: Documentation for MonkeyRunner tool 
Change-Id: I6bf21fe1e406b771c9fe8c36be4ad60b522d088d
 2010-11-01 13:11:28 -07:00
Dianne Hackborn
4f405ecee9 am ce0f9e4e: am 42679cea: Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread 
* commit 'ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba':
  Fix issue #3152415: Various confusions in docs about Application
 2010-11-01 12:52:36 -07:00
Dianne Hackborn
ce0f9e4e4f am 42679cea: Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread 
* commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5':
  Fix issue #3152415: Various confusions in docs about Application
 2010-11-01 12:49:51 -07:00
Dianne Hackborn
42679cea5d Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread 2010-11-01 12:47:02 -07:00
Leon Scroggins
5642625cfb Update insertion handler for WebTextView. 
Bug:3152629
Change-Id: If2a33eb5456493fb9b3b2c54fcc4f5348fe129e1
 2010-11-01 15:45:37 -04:00
Joe Onorato
4f50e8863f Merge "Long press on menu no longer opens the IME." 2010-11-01 12:28:19 -07:00
Joe Onorato
6c586dbb97 Long press on menu no longer opens the IME. 
Bug: 3063616
Change-Id: I6f13300d2dc2f7fa549c7329e9b5509b6d4ffd5d
 2010-11-01 12:25:08 -07:00
Ben Komalo
de4077487d Merge "Minor Javadoc fix." 2010-11-01 12:11:26 -07:00
Ben Komalo
5ad7af6fc7 Minor Javadoc fix. 
Change-Id: I4978e8a493f393390e05e7e6a0179854997e86ce
 2010-11-01 12:04:51 -07:00
Wink Saville
fd2d013027 Add PhoneStateListener.onOtaspChanged. 
Bug: 3102320
Change-Id: I46e8d33a4ed80e5e074e92135653d57598d4c865
 2010-11-01 11:46:57 -07:00
Jean-Baptiste Queru
6831524a49 am ce128ae6: am b6db2d51: Merge "Bluetooth OBEX timeout problem." 
* commit 'ce128ae66dc6d430aad09ad920133bc040d834c8':
  Bluetooth OBEX timeout problem.
 2010-11-01 10:55:49 -07:00
Jean-Baptiste Queru
ce128ae66d am b6db2d51: Merge "Bluetooth OBEX timeout problem." 
* commit 'b6db2d5125511284ee0962dd85d9be0099e51b22':
  Bluetooth OBEX timeout problem.
 2010-11-01 10:53:09 -07:00
Brian Carlstrom
50530c8176 Merge "Change SamplingProfiler to use a sampling interval instead of Hz" 2010-11-01 10:47:45 -07:00