ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
33,186 Commits 2 Branches 0 Tags 54 MiB
3e875c3891
Commit Graph

33186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
3e875c3891 am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-07 15:09:02 -07:00
Jake Hamby
e121cd7408 Merge "resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-06-07 15:03:51 -07:00
Mathias Agopian
13b37b896b am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-07 15:02:53 -07:00
Jake Hamby
5403b2a82d resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp 
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
 2011-06-07 15:01:50 -07:00
Mathias Agopian
3d95709b08 am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-07 14:58:02 -07:00
Mathias Agopian
36ca5e7217 fix a surface leak introduced by a failed merge (DO NOT MERGE) 
Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
 2011-06-07 14:52:22 -07:00
Irfan Sheriff
85fc1fc4b3 am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE 
* commit '84db79bb65bce5c1fd8a6e033cb7e4db4c04f9b1':
  Clear IP configuration on lost network
 2011-06-07 13:44:40 -07:00
Irfan Sheriff
fbc4a8dbbe Merge "Clear IP configuration on lost network" into honeycomb-LTE 2011-06-07 13:40:38 -07:00
Andreas Huber
1676bf95df am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '8e97372913c9236ffdee175c6da99dc00c22b3e1':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-07 13:23:54 -07:00
Martijn Coenen
12d2c1ea65 am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit 'ed1c8d7dc09996351db711be7d2acf0ff4715c2d':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-07 13:23:11 -07:00
John Wang
cf9e9a9611 am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '71030e536522449f34dc584fda94f34e7be6ee19':
  Add SIM PUK unlockscreen.
 2011-06-07 13:16:09 -07:00
Robert Greenwalt
80c3e8c4cd am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE 
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
  Reveal some network constants.
 2011-06-07 13:12:29 -07:00
John Wang
3811395d3a Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 2011-06-07 12:56:49 -07:00
Robert Greenwalt
2e13ac10a7 resolved conflicts for merge of 8de47a2f to honeycomb-LTE 
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
 2011-06-07 12:45:41 -07:00
Robert Greenwalt
aa580c7936 Merge "Reveal some network constants." into honeycomb-mr2 2011-06-07 12:00:37 -07:00
Adam Powell
133219525c am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public. 
* commit '212d15c746f2611339026c16e5fa1aeb7f9090b7':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
 2011-06-07 11:36:32 -07:00
Adam Powell
aa5750fd23 am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public. 
* commit 'a476813dccec241632810c1cbb11bcfbf17841b0':
  Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
 2011-06-07 11:32:23 -07:00
Wink Saville
d37a1fa8d4 am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE 
* commit 'c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
  Preferred network discrepancy after rild is restarted.
 2011-06-07 11:03:25 -07:00
Robert Greenwalt
c8edfa4658 am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE 
* commit '350b78291de725a1607395055b6d28655d9e1080':
  Fix NPE in the statusbar.
 2011-06-07 11:01:23 -07:00
Wink Saville
1baddeb506 Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE 2011-06-07 10:58:09 -07:00
Robert Greenwalt
91d9684a0b Merge "Fix NPE in the statusbar." into honeycomb-LTE 2011-06-07 10:57:20 -07:00
Jaikumar Ganesh
c3c1b199f0 am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 
* commit 'c8410017502dacff43ecd3e0926049b99fc186a8':
  Remove discoverable timeout handler. DO NOT MERGE
 2011-06-07 10:01:28 -07:00
Jeff Brown
8f6540741c am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 
* commit 'fd3244868dec40707039cd616dd37ada41774547':
  Fix build.
 2011-06-06 21:11:44 -07:00
Jeff Brown
25065bbb27 am 5cb05eea: Merge "Fix build." into honeycomb-mr2 
* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
  Fix build.
 2011-06-06 21:08:25 -07:00
Jeff Brown
a6d2cd4f07 Merge "Fix build." into honeycomb-mr2 2011-06-06 21:06:30 -07:00
Jeff Brown
b7edd04f7a am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit 'bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
  Revert velocity damping. Bug: 4364920
 2011-06-06 20:36:49 -07:00
Jeff Brown
c7e6b30d58 am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 
* commit '797dc698e9ff85c1a09874cc3f7bfe825b2ff0e1':
  Simplify spot tracking logic. Bug: 4124987
 2011-06-06 20:36:41 -07:00
Jeff Brown
309dbd84d5 am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 
* commit 'b3536145725250401d25ffa00cda85d222dfc21e':
  Touch pad improvements. Bug: 4124987
 2011-06-06 20:34:38 -07:00
Jeff Brown
1531e594fb am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit '2c1804998b6a3f1f9f5f301ccf813363825ab4cf':
  Revert velocity damping. Bug: 4364920
 2011-06-06 20:34:35 -07:00
Irfan Sheriff
11a86725b3 am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 
* commit 'b400184ad6277676048a30b042ed0667de662ad8':
  Handle AsyncChannel disconnect in WifiService
 2011-06-06 20:34:35 -07:00
Jeff Brown
3a550fa828 am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 
* commit 'b92dcf9c062064dcca9298b089d95a3ce1ba2e75':
  Simplify spot tracking logic. Bug: 4124987
 2011-06-06 20:34:33 -07:00
Jeff Brown
0a3b747378 am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 
* commit 'ed48fa89a8e31b04681347a9235c2a566e7dbb8e':
  Touch pad improvements. Bug: 4124987
 2011-06-06 20:32:25 -07:00
Jeff Brown
1d3a7130f9 Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 2011-06-06 20:32:18 -07:00
Jeff Brown
8b9bff6852 am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 
* commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e':
  Improve browser scrolling when using the mouse wheel.
 2011-06-06 20:32:02 -07:00
Irfan Sheriff
e69a575f0a Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 2011-06-06 20:31:55 -07:00
Jeff Brown
455c66e7ff Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 2011-06-06 20:31:55 -07:00
Jeff Brown
e5c60a3479 Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 2011-06-06 20:30:47 -07:00
Jeff Brown
bc4d24cef7 am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 
* commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f':
  Improve browser scrolling when using the mouse wheel.
 2011-06-06 20:29:08 -07:00
Jeff Brown
769acf8623 Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 2011-06-06 20:27:28 -07:00
Jeff Brown
7ca7ba2064 Revert velocity damping. 
Bug: 4364920

Velocity damping proved to be a bad idea because it would
cause a significant ramp in velocity at the beginning of
a gesture, instead of the desired smooth behavior.  Oh well.

Change-Id: Ie631946f47ef2492bd71fbed1ab44bbb39a875a8
 2011-06-06 20:23:54 -07:00
Dianne Hackborn
67c22b4388 am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit 'fc3fa5dc1045a8f25fc1982443e05873edf028df':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-06 18:18:34 -07:00
Xavier Ducrohet
1b6c1b73d1 am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'f6e479993e7c85265692829990ceb3879fbce424':
  Import the Layoutlib from hc-mr1.
 2011-06-06 18:11:33 -07:00
Romain Guy
445abdcf8d am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit '258f32e2e3ff7f4f4b1395cae292098141047fde':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-06 17:54:12 -07:00
Dianne Hackborn
4e4c8c6482 am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit '1b405592550c719aa5dd93178705ae08b4e84a2f':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-06 17:33:59 -07:00
Dianne Hackborn
1975da38d2 Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 2011-06-06 17:30:50 -07:00
Romain Guy
47a5fe58d2 Merge "Disable plugins if setPluginsEnabled(false) called." 2011-06-06 16:23:25 -07:00
Xavier Ducrohet
52909f1bac am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit '2a6dc7f19d463c7c9f7aacd12eca5263afd25a90':
  Import the Layoutlib from hc-mr1.
 2011-06-06 16:20:16 -07:00
Xavier Ducrohet
83176b7577 Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 2011-06-06 16:17:44 -07:00
Jake Hamby
a5338831fa resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp 
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
 2011-06-06 15:33:37 -07:00
Mathias Agopian
8180456e9c am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit 'c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:25:32 -07:00