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

35290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TK MUN
b8e736140b am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 12:57:24 -07:00
Eric Fischer
b0387cd209 am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e34ed24f4d32ad20716caf3056a7b007a0277500':
  Import revised translations.  DO NOT MERGE
 2011-06-06 12:57:14 -07:00
Jaikumar Ganesh
6f027fecc1 am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '5aaed0970be451479a07b2423e709026dec6611b':
  Require bonding and encryption for PBAP server
 2011-06-06 12:56:55 -07:00
Jean-Baptiste Queru
ac953eef76 am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '59242cf65ec775ccb6cb3639df4eab6af09f3108':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 12:56:29 -07:00
Marco Nelissen
4851d29b9b Merge "resolved conflicts for merge of b2fd84ad to master" 2011-06-06 12:33:40 -07:00
Marco Nelissen
8539ca29e6 resolved conflicts for merge of b2fd84ad to master 
Change-Id: I36b8dba94386981e95abbb0ac8db5e84cce56fb9
 2011-06-06 12:30:40 -07:00
Nick Pelly
78c3bed118 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-06-06 11:52:21 -07:00
TK MUN
82ce6dbd85 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 11:51:22 -07:00
Eric Fischer
f89c33c4d1 am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
RoboErik
a6d8c10bd6 Merge "Cleanup of Calendar.java to prep for api" 2011-06-06 11:39:40 -07:00
Jaikumar Ganesh
63a89d789f am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
  Require bonding and encryption for PBAP server
 2011-06-06 11:34:11 -07:00
Jean-Baptiste Queru
6b078036f6 am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 11:33:52 -07:00
Eric Fischer
8f2bc7998d am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Alex Sakhartchouk
cb3915721d Merge "Unhiding render target code for renderscript" 2011-06-06 10:54:26 -07:00
Eric Fischer
2768505342 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-06 10:38:42 -07:00
Marco Nelissen
0129f1a27f resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp 
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
 2011-06-06 09:55:15 -07:00
John Reck
5d50ae60e8 Merge "Delay set picture if necessary" 2011-06-06 09:25:44 -07:00