ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
31,277 Commits 2 Branches 0 Tags 54 MiB
1010c71709
Commit Graph

31277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
61faf8255a am 5a2c6fbf: am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 
* commit '5a2c6fbf847af971457f014ce7073812c9dd31e7':
  NPE in in AppGlobals#getIntCoreSetting
 2011-03-03 18:22:29 -08:00
satok
a27bd9a6a9 Merge "Add a test for persist properties settings" into honeycomb-mr1 2011-03-03 17:45:33 -08:00
Svetoslav Ganov
40da09601c am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 
* commit 'e70c6607e0316fe390d52a544f6832c60223881f':
  NPE in in AppGlobals#getIntCoreSetting
 2011-03-03 17:37:20 -08:00
Christopher Tate
b32d45f9e1 Merge "Don't spuriously time out restore sessions" into honeycomb-mr1 2011-03-03 17:33:13 -08:00
Eric Fischer
fd94617c21 am 5ea551e6: (-s ours) am 8264781e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '5ea551e637835fd607a4953d7db140ddaa793227':
  Import revised translations.  DO NOT MERGE
 2011-03-03 17:25:18 -08:00
satok
ca268875c1 am d145249b: (-s ours) am c91437d3: do not merge: Cherry pick change I878192090 from master. 
* commit 'd145249b4f7b32cd7f78899fd64ebb91e42389ef':
  do not merge: Cherry pick change I878192090 from master.
 2011-03-03 17:25:12 -08:00
Carl Shapiro
a134afba0d Merge "Fix a compare of JNI references to use IsSameObject." 2011-03-03 17:17:43 -08:00
Michael Kolb
07966c62f1 Merge "fix NPE in getSearchBox" into honeycomb-mr1 2011-03-03 17:16:10 -08:00
Lorenzo Colitti
840137c0fe am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread 
* commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69':
  Add a protocol property to the APNs and use it.
 2011-03-03 17:07:56 -08:00
Lorenzo Colitti
99ee72c3ba am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread 
* commit '6987036fabbd2c0351986efcfd11e714ae75fdf8':
  Make setupDataCall take a protocol parameter.
 2011-03-03 17:07:50 -08:00
Lorenzo Colitti
69418b43e9 Merge "Fix IPv6->IPv4 fallback for HTTPS." 2011-03-03 17:04:21 -08:00
Lorenzo Colitti
be1b18fcae Merge "Add a protocol property to the APNs and use it." into gingerbread 2011-03-03 17:04:07 -08:00
Lorenzo Colitti
3187c38719 Merge "Make setupDataCall take a protocol parameter." into gingerbread 2011-03-03 17:03:58 -08:00
Ken Wakasa
a37acda645 Merge "Append IME's name to the subtype name in the "Select input method" dialog" into honeycomb-mr1 2011-03-03 17:02:47 -08:00
Stephen Hines
ddd5680e8f Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1 2011-03-03 16:14:00 -08:00
Wink Saville
cc8b7841d6 Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1 2011-03-03 16:13:07 -08:00
Stephen Hines
ca0aad4a3b Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1 2011-03-03 16:12:08 -08:00
Eric Fischer
2a6ed6981b Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1 2011-03-03 16:03:20 -08:00
Wink Saville
a916c69edb Merge "ApnSettings: Removal of Enabled, Class and Inactivity Timer." 2011-03-03 16:02:10 -08:00
Eric Fischer
d4fbc14ecb am 8264781e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '8264781eb070b980664aa3994b162886b4a74678':
  Import revised translations.  DO NOT MERGE
 2011-03-03 15:48:55 -08:00
satok
668e2e9847 am c91437d3: do not merge: Cherry pick change I878192090 from master. 
* commit 'c91437d38ae14a20046de47831eb0f9bfd329af7':
  do not merge: Cherry pick change I878192090 from master.
 2011-03-03 15:47:43 -08:00
Shimeng (Simon) Wang
01de8bf052 Merge "Shorten the animation length to make it snappier." into honeycomb-mr1 2011-03-03 15:39:18 -08:00
Adam Powell
43c8a026ad Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1 2011-03-03 15:13:04 -08:00
Adam Powell
f1ebc42169 Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1 2011-03-03 15:12:02 -08:00
Jeff Brown
e572319eaf am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 
* commit 'e23c235c662c3028cfb080c6ed60d7defcdd0b69':
  Only set KeyEvent long press flag when repeat count equals 1.
 2011-03-03 15:03:26 -08:00
Irfan Sheriff
332f4c5204 Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1 2011-03-03 15:01:53 -08:00
Carl Shapiro
35459558c8 Merge "Establish a global reference before saving a class into a global." 2011-03-03 14:44:50 -08:00
Jeff Brown
7a1626f037 Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 2011-03-03 14:42:14 -08:00
Irfan Sheriff
2bce7ea66d Merge "update current config with dhcp settings" 2011-03-03 14:39:59 -08:00
Andreas Huber
ebbfa938de Merge "Reject streaming .mp4 files over http that are not muxed reasonably." 2011-03-03 14:33:25 -08:00
Svetoslav Ganov
92b0e11d6a Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 2011-03-03 14:25:13 -08:00
Eric Fischer
e5bae6fbac Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-03 14:21:32 -08:00
Carl Shapiro
2aa44be08f Merge "Eliminate an assignment of a local reference to a global variable." 2011-03-03 14:13:09 -08:00
Leon Scroggins
fd8f5a4a4e Merge "Assets for WebView buttons." 2011-03-03 12:33:34 -08:00
Fabrice Di Meglio
b83025cf80 Merge "Add TextLayout Cache" 2011-03-03 12:21:15 -08:00
Mike Lockwood
5bbd6a9bcb am 43f0640f: (-s ours) am d948b85d: (-s ours) am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory 
* commit '43f0640fbf476404139eb8a196465000933da4ef':
  DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
 2011-03-03 11:46:51 -08:00
Mike Lockwood
d8cd74f684 am 86f1c4d3: (-s ours) am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread 
* commit '86f1c4d3ba53ea11484628081e8e49ca86e897b9':
  DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
 2011-03-03 11:46:48 -08:00
Scott Main
0975816989 am 6c8d7652: am f1d8e049: docs: fix error in themes doc 
* commit '6c8d76527c938eb49182a6fd0677ccbc1618e7a8':
  docs: fix error in themes doc
 2011-03-03 11:46:37 -08:00
Mike Lockwood
8a993b481f am d948b85d: (-s ours) am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory 
* commit 'd948b85dc9d0362a2ba0f7a3b905be0107a948f4':
  DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
 2011-03-03 11:42:13 -08:00
Mike Lockwood
a4c4fbe3b0 am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread 
* commit 'e91e5f6e9db4db5cd53836c901a7f80c11abb55c':
  DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
 2011-03-03 11:42:05 -08:00
Stephen Hines
07eeadb7fe Merge "Almost all warnings are now errors in RS build." 2011-03-03 10:34:25 -08:00
Stephen Hines
934dcc7889 Merge "Fix typos in RenderScript docs." 2011-03-03 10:34:03 -08:00
Scott Main
f039adc726 am f1d8e049: docs: fix error in themes doc 
* commit 'f1d8e04912b6a4031e0d1f129c231de869852a04':
  docs: fix error in themes doc
 2011-03-03 10:06:20 -08:00
Leon Scroggins
ec11f4057e Merge "Move NinePatchPeeker into its own file." 2011-03-03 09:13:22 -08:00
Robert Greenwalt
7065151cc8 Merge "Clean up LTE code change" 2011-03-03 08:33:54 -08:00
Robert Greenwalt
7eb811e0f5 Merge "Add some input checking to prevent problems" 2011-03-03 08:32:53 -08:00
Jeff Brown
b0345f60ba Merge "Recognize 3D joysticks." 2011-03-03 03:40:34 -08:00
satok
4de1ccb8c7 Merge "Add tests for SystemProperties.java" 2011-03-03 02:56:00 -08:00
Jeff Brown
8097fb47cd Merge "Fix off by one errors in touch motion ranges." 2011-03-03 02:41:36 -08:00
Bjorn Bringert
b263d690ff Merge "Pass AppData to the app from SearchDialog queries." 2011-03-03 00:18:23 -08:00