Commit Graph

30823 Commits

Author SHA1 Message Date
Jeff Brown
911a0cfb94 Merge "Log errors reading input channel from parcel." 2011-02-26 15:47:14 -08:00
Jeff Brown
b41c8e7387 Merge "Make SHIFT+Backspace be forward delete." 2011-02-26 15:40:51 -08:00
Jeff Brown
66f05878b9 Merge "Add scroll wheel support to TextView." 2011-02-26 14:31:21 -08:00
Mike Lockwood
0a51271c8c am 710c510b: (-s ours) am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
* commit '710c510b36a2d260736ca6d036365b18c86b1774':
  DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
2011-02-26 13:33:19 -08:00
Mike Lockwood
8e0c038217 am fbd67fec: (-s ours) am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit 'fbd67fec87e425cfbbd80926cec8cd345d134b4c':
  DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
2011-02-26 13:33:16 -08:00
Mike Lockwood
70e3799cc0 am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '1b8956398be6aeacf0383d8e0931771dbd3a6d2b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:33:12 -08:00
Mike Lockwood
c3ce4d6b44 am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit 'bbd460d76dc69eca9a14ab1127b95a55429f460a':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:33:02 -08:00
Mike Lockwood
952c7384bb am 8719c406: DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
* commit '8719c406c3db17842d9350c1f6611f088d105f38':
  DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
2011-02-26 13:21:28 -08:00
Mike Lockwood
b97d6bcfb2 am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit '0600fff9149df3af01e90d4996b70dbc1ee7c135':
  DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
2011-02-26 13:21:23 -08:00
Mike Lockwood
af21ccaf61 am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '69e19ae15baa5785667dbf45c7a2d508e429099b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:21:20 -08:00
Mike Lockwood
673eb806cb am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:21:05 -08:00
Jamie Gennis
b2e7977305 Merge "Expand on the SurfaceTexture API docs." 2011-02-25 18:15:22 -08:00
Jesse Wilson
e9abf68913 Merge "Handle rename of LruCache.entryEvicted to entryRemoved" 2011-02-25 17:55:00 -08:00
Jeff Brown
338aa8c9ef Merge "Add support for mouse hover and scroll wheel." 2011-02-25 17:28:50 -08:00
Jesse Wilson
25d8962530 Merge "Callback on any removal, not just evictions." 2011-02-25 17:15:44 -08:00
Glenn Kasten
84851d2b5a Merge "Revert the 11.xml part of bug 3438513" 2011-02-25 17:10:00 -08:00
Dianne Hackborn
c614e553cc Merge "Implement issue #3426299: Introduce application "stopped" state" 2011-02-25 16:15:27 -08:00
Chet Haase
4de33f6d13 Merge "ViewPropertyAnimator cancels prior animations" 2011-02-25 16:02:34 -08:00
Andreas Huber
2b6fff5ed6 am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:43:07 -08:00
Andreas Huber
4337714147 am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
2011-02-25 15:38:06 -08:00
Andreas Huber
ebe5114be6 Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb 2011-02-25 15:33:28 -08:00
Adam Cohen
26e9e35d14 Merge "Adding framework support for resizable widgets" 2011-02-25 15:28:29 -08:00
Robert Greenwalt
70817664ab Merge "Fixing the write of BackgroundData setting." 2011-02-25 15:20:30 -08:00
Christopher Tate
9f5b53d4b0 Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens"
This reverts commit c2d55dd89743c8a38deb809f3cdf1ad2d1dbac2b.
2011-02-25 15:18:53 -08:00
Winson Chung
ef71330158 Merge "Fixing build" 2011-02-25 15:17:17 -08:00
Alex Sakhartchouk
2a4d1256aa Merge "Moving dependency includes out of librs headers." 2011-02-25 14:53:34 -08:00
Winson Chung
d51815e7d2 Merge "Fixing issue where RemoteViewsService.onDestroy() was never being called." 2011-02-25 14:30:37 -08:00
Xavier Ducrohet
b8ff70fe39 Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods." 2011-02-25 14:28:20 -08:00
Jaikumar Ganesh
3d060d447a Merge "Unset device trust state before unpairing." 2011-02-25 14:25:16 -08:00
Gilles Debunne
0e78830361 Merge "Code clean-up around ScrollView." 2011-02-25 13:48:19 -08:00
Gilles Debunne
0db9091a57 Merge "Removed ViewTreeObserver in TextView when handles are hidden" 2011-02-25 13:47:37 -08:00
David Li
1baaecc7c4 Merge "Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0" 2011-02-25 12:59:14 -08:00
Samyeoul Choi
8ba7319527 am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '350799b72c3180e04ec91469509f6079c932b971':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:55:35 -08:00
Samyeoul Choi
889dda2ec3 am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:51:51 -08:00
Svetoslav Ganov
d159f32212 am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit 'dc365a36dac50bccc1411c37839513daec56d335':
  Use different version of CLDR data in DatePicker
2011-02-25 12:45:53 -08:00
Svetoslav Ganov
005f783fa0 Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-25 12:40:57 -08:00
Svetoslav Ganov
7788d44a5e resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
Samyeoul Choi
2a4d60e301 am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:08:08 -08:00
James Dong
be566cb570 Merge "mp4a box contains mp3 audio when the object type indication is 0x6b" 2011-02-25 11:52:14 -08:00
Eric Fischer
4aa1c420b7 Merge "Import revised translations." 2011-02-25 11:48:14 -08:00
Eric Fischer
70cf6e2faf am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '040f61504aeab1d905ac9fb85945699877e78d4e':
  Import revised translations.  DO NOT MERGE
2011-02-25 11:26:13 -08:00
Eric Fischer
68ca4d3c97 am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '9967ce04572e916a5f68ae0f9345f13b35ec20b0':
  Import revised translations.  DO NOT MERGE
2011-02-25 11:11:13 -08:00
Eric Fischer
d0a5556b00 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-25 10:54:34 -08:00
Shimeng (Simon) Wang
822029f742 Merge "Make sure pinch zoom and overview scale are within limits" 2011-02-25 10:37:33 -08:00
Vasu Nori
66bbadffa3 Merge "bug:3467948 if byteArray couldn't be allocated for blob, throw exception" 2011-02-25 08:57:59 -08:00
Leon Scroggins
4810e557ac Merge "Comment clean up." 2011-02-25 08:21:23 -08:00
Wu-cheng Li
49ff84c4cc Merge "Improve camera getSupportedPreviewFormats javadoc." 2011-02-25 01:36:56 -08:00
Svetoslav Ganov
c93b9968b2 am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
* commit '9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
  Use different version of CLDR data in DatePicker
2011-02-25 00:09:03 -08:00
Svetoslav Ganov
c174c6696c Merge "Use different version of CLDR data in DatePicker" into gingerbread 2011-02-24 23:56:52 -08:00
Wink Saville
aa7ce3a016 Merge "LTE Changes for Telephony including Multiple PDN support and IPV6 support" 2011-02-24 22:08:41 -08:00