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

35357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
38986ffd62 am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-07 11:15:01 -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
Mike Lockwood
5d56ce7c82 Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED" 2011-06-07 11:02:58 -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
Wu-cheng Li
4fee337c36 Merge "Improve android.hardware.Camera.Area javadoc." 2011-06-07 04:05:35 -07:00
Xia Wang
3271492aa6 Merge "Add OpenGl benchmark tests: display images with different texture in each mesh." 2011-06-06 22:00:31 -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
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
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
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
33c88c8681 Merge "Add force-stop subcommand for 'am'." 2011-06-06 19:01:48 -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
Xavier Ducrohet
c7492c07b4 am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit 'd6ce6791f26fd0a7cf89ded2847011a4894013e1':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-06 18:08:40 -07:00
Xavier Ducrohet
9bbc6b0528 am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'ee1b497648a0c3c03b09c4739619f23315d491fb':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-06 18:08:32 -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
Fabrice Di Meglio
7342be80f2 Merge "Rename Gravity BEFORE/AFTER to START/END" 2011-06-06 16:48:30 -07:00
Romain Guy
47a5fe58d2 Merge "Disable plugins if setPluginsEnabled(false) called." 2011-06-06 16:23:25 -07:00
Eric Fischer
6f201cc8b1 Merge "Import revised translations." 2011-06-06 16:22:35 -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
James Dong
7c580daacb Merge "Fix the comment for the location box @xyz" 2011-06-06 15:54:10 -07:00
Ben Komalo
19bf7ebe49 Merge "Makes SSLCertificateSocketFactory more flexible" 2011-06-06 15:50:10 -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
Mathias Agopian
e667e0c73b am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:21:44 -07:00
Mathias Agopian
f3d939c5e5 merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
Fix a race that could cause GL commands to be executed from the wrong thread.
  RefBase subclasses can now decide how they want to be destroyed.
  Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
  Fix a race-condtion in SurfaceFlinger that could lead to a crash.

initial cherry-pick:
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
 2011-06-06 15:14:25 -07:00
Fabrice Di Meglio
2b7b45f2aa Merge "Fix USE_TEXT_LAYOUT_CACHE define" 2011-06-06 14:14:36 -07:00
Martijn Coenen
2704115312 Merge "Connecting to a NFC technology may fail." 2011-06-06 13:46:47 -07:00
Jeff Brown
2ac75c1f4b Merge "Copy pointer assets for hdpi." 2011-06-06 13:14:13 -07:00
Nick Pelly
3734299b72 am 92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit '92279c0fa1c15bd4afaf051bed90776fa64744c1':
 2011-06-06 12:57:32 -07:00