ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,986 Commits 2 Branches 0 Tags 54 MiB
67265750c0
Commit Graph

23986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins
fbb0691d77 Merge "Merge commit '55381217' into manualmerge" 2010-11-01 15:16:24 -07:00
Jeff Brown
6bb0e226b5 Merge "Fix policy issues when screen is off." 2010-11-01 15:13:10 -07:00
Jason Sams
40492421bd Merge "Add code to mark functions rather than whole files as threadable." 2010-11-01 15:10:09 -07:00
Jaikumar Ganesh
6d91ce50e8 Merge "Disconnect PAN and Input devices on BT disable." 2010-11-01 15:06:05 -07:00
Adam Powell
fe33dad68c Merge "Fix a find and replace bug in Theme.IconMenu" 2010-11-01 15:02:13 -07:00
Leon Scroggins
926f9efad4 Merge commit '55381217' into manualmerge 
Conflicts:
	core/java/android/webkit/WebView.java

Change-Id: I1e93881a55c1d81c1142db03498c68196649b69c
 2010-11-01 18:00:55 -04:00
Jeff Brown
fd749c63b0 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
7b425df5c1 Merge "Various PreferenceActivity and related improvement." 2010-11-01 14:54:32 -07:00
Leon Scroggins
a61c53dfe5 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
Leon Scroggins
fd2ddb4c43 Merge "Update insertion handler for WebTextView." into gingerbread 2010-11-01 14:49:47 -07:00
Wink Saville
6e2b38a79c Merge "Add PhoneStateListener.onOtaspChanged." 2010-11-01 14:47:38 -07:00
Jason Sams
19adfe081e Merge "Remove excessive logging." 2010-11-01 14:28:57 -07:00
Chet Haase
0d8aaea70d Merge "Performance optimizations for animations and toolkit" 2010-11-01 13:53:31 -07:00
Jean-Baptiste Queru
1fbfce4244 am 41c73884: am 5b4d0e84: Merge "TabWidget orientation" 
* commit '41c738849c1fdf29357048ec9f5e48143dbb026a':
  TabWidget orientation
 2010-11-01 13:33:46 -07:00
Jean-Baptiste Queru
39fc718490 am 5b4d0e84: Merge "TabWidget orientation" 
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
  TabWidget orientation
 2010-11-01 13:30:49 -07:00
Jean-Baptiste Queru
86b2b99f9d Merge "TabWidget orientation" 2010-11-01 13:19:02 -07:00
Dianne Hackborn
70be9dfbe9 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
cc3af429d8 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
2ee26e2cf4 Merge "Fix issue #3152415: Various confusions in docs about Application" into gingerbread 2010-11-01 12:47:02 -07:00
Joe Onorato
8afcfdc725 Merge "Long press on menu no longer opens the IME." 2010-11-01 12:28:19 -07:00
Ben Komalo
c054247b85 Merge "Minor Javadoc fix." 2010-11-01 12:11:26 -07:00
Jean-Baptiste Queru
7e03633841 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
4188d55474 am b6db2d51: Merge "Bluetooth OBEX timeout problem." 
* commit 'b6db2d5125511284ee0962dd85d9be0099e51b22':
  Bluetooth OBEX timeout problem.
 2010-11-01 10:53:09 -07:00
Brian Carlstrom
8603388a2b Merge "Change SamplingProfiler to use a sampling interval instead of Hz" 2010-11-01 10:47:45 -07:00
Jean-Baptiste Queru
d37761cfd9 Merge "Bluetooth OBEX timeout problem." 2010-11-01 10:46:36 -07:00
Jean-Baptiste Queru
8ad44fe6d1 am a87cdd39: am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)." 
* commit 'a87cdd398fa8b46eb48b4f9a7a6b114a336e3bf2':
  Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
 2010-11-01 10:42:40 -07:00
Jean-Baptiste Queru
1cf05e8506 am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)." 
* commit 'b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
  Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
 2010-11-01 10:39:01 -07:00
Jean-Baptiste Queru
24574f1312 Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)." 2010-11-01 10:29:22 -07:00
Joe Onorato
b620238a42 Merge "Allow both contentIntent and setOnClickPendingIntent in notifications" 2010-10-31 11:41:47 -07:00
Joe Onorato
dbd9bf6592 Merge "Allow RemoteViews to silently fail when a view can't be found." 2010-10-31 11:41:22 -07:00
Romain Guy
220fb0744c am f101a85b: am cee8d1d3: Merge "fix typo" 
* commit 'f101a85bc3210b3c0ae9c916dd8fbdf88282caad':
  fix typo
 2010-10-31 11:26:31 -07:00
Romain Guy
bcd52db16e am cee8d1d3: Merge "fix typo" 
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f':
  fix typo
 2010-10-31 11:21:24 -07:00
Romain Guy
a290bb6aba Merge "fix typo" 2010-10-31 11:12:51 -07:00
Dianne Hackborn
c16e2bd6e6 am c6b7b2df: (-s ours) am 70a2c15e: Final SDK API 9. DO NOT MERGE. 
* commit 'c6b7b2dfaaab2cd8ec1940a4515b15433c83d190':
  Final SDK API 9.  DO NOT MERGE.
 2010-10-29 19:05:38 -07:00
Dianne Hackborn
35cd3521e2 am 70a2c15e: Final SDK API 9. DO NOT MERGE. 
* commit '70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
  Final SDK API 9.  DO NOT MERGE.
 2010-10-29 19:03:03 -07:00
Dianne Hackborn
3e348e10ee Merge "Add new resize mode to not resize, new web input types." 2010-10-29 18:24:03 -07:00
Scott Main
7640e636b7 am f2ca96bc: am 38fd3948: am 579db096: docs: remove another "new" tag 
* commit 'f2ca96bcc9f5117a79c69edf11026653643419a3':
  docs: remove another "new" tag
 2010-10-29 17:23:24 -07:00
Scott Main
d0af840115 am 38fd3948: am 579db096: docs: remove another "new" tag 
* commit '38fd394815a992c8874f73389e8ca849782e5fcd':
  docs: remove another "new" tag
 2010-10-29 17:21:07 -07:00
Scott Main
33f2f39576 am 579db096: docs: remove another "new" tag 
* commit '579db096fa05bd077fadb04876ecf99e3ccd02b9':
  docs: remove another "new" tag
 2010-10-29 17:16:57 -07:00
Neal Nguyen
6071aa04db am 2202c8b9: am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread 
* commit '2202c8b9f25c74e2b7f87090f9963683744b573e':
  A little tweaking of DL Manager tests and adding better debugging output.
 2010-10-29 17:12:26 -07:00
Neal Nguyen
8154016625 am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread 
* commit '06875afad6101892a735f79aeb2c7bdbb58c26fa':
  A little tweaking of DL Manager tests and adding better debugging output.
 2010-10-29 17:10:12 -07:00
Neal Nguyen
e24b6ae868 Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread 2010-10-29 17:07:59 -07:00
Xavier Ducrohet
83a13a7ca2 Merge "Implement the layoutlib Bitmap through a native delegate." 2010-10-29 17:07:14 -07:00
Gloria Wang
f0b9eb6c7f Merge "Add support for WV plugin" 2010-10-29 16:58:15 -07:00
Mike Lockwood
c4ea94f0d1 Merge "Add new WRITE_MEDIA_STORAGE permission to control write access to /data/media" 2010-10-29 16:44:48 -07:00
Brad Fitzpatrick
8d23335ee4 Merge "StrictMode: annotate violations with the Broadcast Intent's action, if any." 2010-10-29 16:26:39 -07:00
James Dong
c1e0ef6070 Merge "Added some debugging log messages at stop()" 2010-10-29 16:16:39 -07:00
Gloria Wang
0f31106acf Merge "- register DRM sniffer only when drmserver is up - notify DRM agents the status after seeking" 2010-10-29 16:15:46 -07:00
Joe Onorato
f1c64ba35b Merge "use the holo theme in more places for >= honeycomb apps" 2010-10-29 16:10:46 -07:00
Adam Powell
ed01d5d85f Merge "Action bar API updates - new display options" 2010-10-29 15:43:05 -07:00