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

35362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
3b462032b0 am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 
* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.
 2011-06-07 17:52:53 -07:00
Jeff Brown
5d99f17e82 am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
  Revert velocity damping. Bug: 4364920
 2011-06-07 17:52:30 -07:00
Jeff Brown
76ad002c32 am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 
* commit '55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
  Simplify spot tracking logic. Bug: 4124987
 2011-06-07 17:52:22 -07:00
Jeff Brown
31033629f9 resolved conflicts for merge of 8b2c0014 to master 
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
 2011-06-07 17:48:39 -07:00
Irfan Sheriff
325c998a90 am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 
* commit '5e4d0206486378ffc7d2992750e439d54df15147':
  Handle AsyncChannel disconnect in WifiService
 2011-06-07 17:19:02 -07:00
Jeff Brown
afabfe49ec am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 
* commit 'c3709f2509bfc15d13a590b8342503f858ee67e2':
  Improve browser scrolling when using the mouse wheel.
 2011-06-07 17:18:48 -07:00
Dianne Hackborn
c0a288c1d6 am 4bd50588: am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit '4bd505883df3d8ca7583d854f1c71302c615519d':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-07 17:18:16 -07:00
Xavier Ducrohet
fea4102ba8 am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'abc838716816107754ab0479242d03807ce79fc2':
  Import the Layoutlib from hc-mr1.
 2011-06-07 17:17:11 -07:00
Jeff Brown
1c251f9d9a Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 2011-06-07 16:58:06 -07:00
Adam Powell
09f3fcd6fa am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '7ed8ff18ce16312b86bd7da855e185b9ecc934a8':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-07 16:37:35 -07:00
Jake Hamby
00ff7d1669 am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
  Fixes for SMS Cell Broadcast support.
 2011-06-07 16:32:10 -07:00
Jake Hamby
ca1df0ccac resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
 2011-06-07 16:24:15 -07:00
Adam Powell
88208e7317 am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-07 16:22:32 -07:00
Adam Powell
886afd25c9 Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 2011-06-07 16:19:26 -07:00
Brian Carlstrom
346f28be0b Merge "Change KeyChain to assume PEM encoded keystore entries" 2011-06-07 15:57:29 -07:00
Frank Sposaro
499bfcc48d Merge "Fixed typo. "a a" -> "a"" 2011-06-07 15:57:11 -07:00
John Wang
f0bb18115c am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.
 2011-06-07 15:56:19 -07:00
Dianne Hackborn
08debb343e am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit 'ee3de4a950a188c6a4d5fb732242249af4807837':
  Remove compat mode dialog.
 2011-06-07 15:56:05 -07:00
Dianne Hackborn
5252ccec49 am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:52:38 -07:00
John Wang
b7dfeedb56 Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 2011-06-07 15:49:34 -07:00
Dianne Hackborn
089fbb0fc6 am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
  Remove compat mode dialog.
 2011-06-07 15:47:14 -07:00
Dianne Hackborn
c16a374f3f Merge "Remove compat mode dialog." into honeycomb-mr2 2011-06-07 15:45:14 -07:00
Dianne Hackborn
991e72babe am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:39:43 -07:00
Christopher Tate
5f3274036c Merge "Don't ack/nak backup redundantly at exit" 2011-06-07 15:37:08 -07:00
Dianne Hackborn
6086cca9ff Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 2011-06-07 15:36:51 -07:00
Christopher Tate
41bcc1e343 Merge "Fix embedded spaces in tar stream EVEN HARDER" 2011-06-07 15:20:34 -07:00
Irfan Sheriff
cbc5f74295 Merge "Update walled garden detection logic" 2011-06-07 15:16:00 -07:00
Xavier Ducrohet
4eed1b7dca am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit '67f09cd090adae6365ca36546b0a517e51255876':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-07 15:09:39 -07:00
Xavier Ducrohet
1c144773d2 am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-07 15:09:31 -07:00
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
Amith Yamasani
fa5ae9b6da Merge "Volume Panel sizing for phones." 2011-06-07 14:48:50 -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
Yu Shan Emily Lau
5e8db8ac37 Merge "Cleaned up the old test cases and test media files." 2011-06-07 13:40:04 -07:00
Daniel Sandler
771e725e10 Merge "Experimental compatibility mode UI." 2011-06-07 13:37:08 -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
Christopher Tate
9f7bcda136 Fix embedded spaces in tar stream EVEN HARDER 
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
 2011-06-07 13:17:17 -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
Mike Lockwood
5212f30bbf Merge "StorageVolume: Add allowMassStorage flag" 2011-06-07 12:44:52 -07:00
Christopher Tate
f6c10aab07 Merge "Implement shared-storage full backup/restore" 2011-06-07 12:25:06 -07:00
Alon Albert
e460063e27 Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates." 2011-06-07 12:16:28 -07:00