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

35357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
3f4997996d Merge "Invalid access to AccessibilityInteractionController" 2011-06-09 15:45:42 -07:00
James Dong
e7648e122c Merge "Add timestamp and data pointer checks in CameraSource" 2011-06-09 15:27:38 -07:00
Stephen Hines
73099c2414 Merge "Override equals()/hashCode() for RS BaseObj." 2011-06-09 15:06:36 -07:00
Adam Powell
9797ca4634 Merge "Fix bug 4501881 - use correct TextAppearances for global actions" 2011-06-09 14:34:45 -07:00
Shimeng (Simon) Wang
d8838de634 Merge "Better handle double tap for smooth reflow and zoom." 2011-06-09 14:10:54 -07:00
Andy McFadden
40a6749c3f Merge "Move CalendarUtils into Calendar app" 2011-06-09 14:07:04 -07:00
John Wang
952443d5f4 am 3948a2b4: am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '3948a2b4205c36bc1b4a3911753d970248480742':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-09 13:55:20 -07:00
Mathias Agopian
a1bb021469 am 96fcb702: am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit '96fcb702d75dcfb36c3ebd8fe420c8b29fa67fb7':
  Fix a leak in RefBase
 2011-06-09 13:54:54 -07:00
Adam Powell
795a715178 Merge "resolved conflicts for merge of fb339016 to master" 2011-06-09 13:16:50 -07:00
Brian Carlstrom
a6d34641a4 Merge "Implement android.webkit.BrowserFrame.requestClientCert" 2011-06-09 12:36:54 -07:00
Adam Powell
1529e14fd2 resolved conflicts for merge of fb339016 to master 
Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac
 2011-06-09 12:15:10 -07:00
Wink Saville
4cc6156566 am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 
* commit '2d8500d21a3fe6af36040a5dcd0599e00a242766':
  Report data status from ApnContext even if data is detached
 2011-06-09 11:58:28 -07:00
Wink Saville
d9ff509b5a am a384ff32: am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE 
* commit 'a384ff32827cf6383ead48ec4e0da42365ed3584':
  Use CSIM to get provision information
 2011-06-09 11:58:16 -07:00
Jean-Baptiste Queru
6d2dc4779a am ed17165a: am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" 
* commit 'ed17165a14e20ab5110be8c86ec1b519835613d0':
  Tweak setViewport stuff for fwd-compat
 2011-06-09 11:56:34 -07:00
John Wang
eb68e8bf07 am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device. 
* commit '1861225be3c848fdf395f7aa815c673af4239011':
  Do not merge. Return null id for Non-phone device.
 2011-06-09 11:56:28 -07:00
Jeff Brown
4d42d9dc35 am 92110af2: am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 
* commit '92110af24a9a93b73264560b57f55f45ec65dab5':
  Fix swipe gesture cosine calculation. Bug: 4124987
 2011-06-09 11:56:21 -07:00
Wink Saville
539f1f687b am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
  Fix default preferred network.
 2011-06-09 11:55:30 -07:00
Dave Santoro
77715554b3 Merge "API modifications to handle profiles in Contacts." 2011-06-09 11:46:43 -07:00
Adam Powell
cba24f03c0 Merge "Bug 4588114 - Make GestureDetector behave nicer with parallel multi-touch detection" 2011-06-09 11:43:19 -07:00
Adam Powell
3ca0c4e20e am 4e1504a6: am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '4e1504a66b37b424c8839e64f97ac823e5358bd5':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-09 11:29:28 -07:00
Jake Hamby
30a1efdf60 am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
  Fixes for SMS Cell Broadcast support.
 2011-06-09 11:29:13 -07:00
John Wang
01e9086e30 am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 
* commit '229d3a0cbce70db82003705abf6844deec136d20':
  Make getDeviceId return null for Non-phone device.
 2011-06-09 11:25:50 -07:00
Dianne Hackborn
d1e0bf27b7 am 816e5b72: am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit '816e5b72190787f2b6136925c172a00ebcbe4077':
  Remove compat mode dialog.
 2011-06-09 11:24:32 -07:00
Dianne Hackborn
9c9cea7bf0 am 891266e3: (-s ours) am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit '891266e36e230fa0a4f4466672834a8e3e97598e':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-09 11:23:10 -07:00
Adam Powell
52e2db4061 Merge "Bug 4563099 - Action bar tabs - place second row tabs on top in the absence of home/up" 2011-06-09 11:14:41 -07:00
John Reck
9542a6382b Merge "Don't cut velocity" 2011-06-09 11:07:54 -07:00
Gilles Debunne
17f04d4305 Merge "Add SwitchPreference" 2011-06-09 10:25:25 -07:00
Jeff Sharkey
71636e8f65 Merge "Persist network stats using AtomicFile." 2011-06-09 10:22:27 -07:00
Steve Block
35b641d61c Merge "Fixes WebView.loadData() to avoid constructing invalid URLs." 2011-06-09 10:16:29 -07:00
Narayan Kamath
4a615d67ea Merge "Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes." 2011-06-09 10:13:47 -07:00
Chet Haase
1bad9fc3ee Merge "Change exception thrown when set() called on readonly Property." 2011-06-09 10:12:04 -07:00
Philip Milne
4839f5c3fe Merge "Fix for baseline alignment in LinearLayout compatibiity mode." 2011-06-09 10:10:26 -07:00
Alex Sakhartchouk
ed0108b46b Merge "More work to make libRS buildable on the host." 2011-06-09 09:42:28 -07:00
Xavier Ducrohet
29951e3d5e am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit '3eb9f8326e6d72be671bf0226965ca3231a25d7d':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-09 09:04:38 -07:00
Xavier Ducrohet
82dd50b3d6 am e1d14a29: (-s ours) am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'e1d14a29ff9aa17923dc4e9406408cbc07a97c31':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-09 09:04:26 -07:00
Romain Guy
e3f2baa793 am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-09 09:03:55 -07:00
Martijn Coenen
b9a541465d Merge "Added support for rediscovering a Tag (API)." 2011-06-09 08:01:25 -07:00
Andy McFadden
10a8840ac1 Merge "Add a URI for recurring event exceptions" 2011-06-09 07:37:07 -07:00
Narayan Kamath
5ae6175aab Merge "Make changes to the TTS api suggested by the API review." 2011-06-09 04:09:22 -07:00
Steve Block
dfad404de4 Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()" 2011-06-09 03:48:41 -07:00
Chung-yih Wang
e4b581afe7 Merge "Add KeepAlive Interval Measurement." 2011-06-09 03:24:55 -07:00
Jake Hamby
1b32c3b473 resolved conflicts for merge of 7ca13deb to master 
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
 2011-06-08 23:20:09 -07:00
Christopher Tate
a87feb9339 Merge "Fix handling of directory entries" 2011-06-08 20:13:57 -07:00
Christopher Tate
61334a3f83 Fix handling of directory entries 
Don't emit tar blocks for directories with an invalid nonzero size.  Also, if
such an entry is encountered during restore, don't actually attempt to treat
it as valid and thus skip over the next actual tar entry.

This patch also adds tracking of the data actually consumed during restore,
and reports a total at the end of stream.

Change-Id: I625173f76df3c007e899209101ff2b587841f184
 2011-06-08 20:11:49 -07:00
Daisuke Miyakawa
84ff6400ce Merge "Introduces new Contacts API for ranking promotion." 2011-06-08 19:55:47 -07:00
Svetoslav Ganov
b68767833e Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly." 2011-06-08 19:44:20 -07:00
John Wang
a89933c191 am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-08 19:41:39 -07:00
John Wang
7f0d352506 Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE 2011-06-08 19:37:56 -07:00
Mathias Agopian
c2db91c3bf am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit 'b40e85f90146a654bfe5657187be491147814ea0':
  Fix a leak in RefBase
 2011-06-08 19:34:30 -07:00
Mathias Agopian
58d6631e4d am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit '645434fb4eff408698423d70904fb8fc709a5225':
  Fix a leak in RefBase
 2011-06-08 19:30:47 -07:00