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

35394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
63db497d0c Merge "KeyChain API refinements" 2011-06-09 21:11:50 -07:00
Adam Powell
fdfdacbdca Merge "Refine the behavior of split action bars." 2011-06-09 21:08:52 -07:00
Marco Nelissen
c048df0cd7 am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit '6a91953cc9bb8a48d867cc53e3cf5286d9a2f5ac':
  Make sure we don't read from invalid fds
 2011-06-09 18:56:02 -07:00
Romain Guy
46b0cbe5ca Merge "Don't apply AA to rects with no rotation/perspective." 2011-06-09 18:55:14 -07:00
Dianne Hackborn
f2cb354757 am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-09 18:42:55 -07:00
Dianne Hackborn
3ca5d8f6e0 resolved conflicts for merge of 9dfd7d0a to master 
Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
 2011-06-09 18:39:37 -07:00
Mathias Agopian
c9af56c64b Merge "improve orientation sensor with gyro data" 2011-06-09 18:22:19 -07:00
John Wang
396638cfbe am 4d042048: am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE 
* commit '4d042048243f38d3062ab4719ac26c9154380115':
  Set emergency call text visibility.
 2011-06-09 18:16:49 -07:00
Mathias Agopian
b6dc95800d am 60ee24fe: (-s ours) am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) 
* commit '60ee24fe487e765c1e6d598aff99b9a5355ef50a':
  Fix a leak in RefBase (DO NOT MERGE)
 2011-06-09 18:16:37 -07:00
Dianne Hackborn
cbbd63fafb Merge "resolved conflicts for merge of e2aa0490 to master" 2011-06-09 18:00:13 -07:00
Romain Guy
a4e05c3c2a Merge "Add a way to measure potential framerate of the view hierarchy." 2011-06-09 17:50:51 -07:00
Dianne Hackborn
5ea8834ab9 resolved conflicts for merge of e2aa0490 to master 
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
 2011-06-09 17:50:36 -07:00
Gilles Debunne
1844b17bbc Merge "Text selection on phone" 2011-06-09 16:56:31 -07:00
Irfan Sheriff
591d27639e Merge "Remove interface disable in wifistatemachine" 2011-06-09 16:53:27 -07:00
Shimeng (Simon) Wang
da82d69345 Merge "Consider default zoom scale for mobile viewport." 2011-06-09 16:41:18 -07:00
Daisuke Miyakawa
af5d185f3b Merge "Add return value spec and fix typo." 2011-06-09 16:34:10 -07:00
James Dong
f349213d71 Merge "Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing" 2011-06-09 16:27:39 -07:00
Andy McFadden
35aafe7e15 Merge "Use public constants" 2011-06-09 16:08:16 -07:00
Fabrice Di Meglio
fe1832ae0f Merge "Add Configuration.getLayoutDirectionFromLocale()" 2011-06-09 16:08:00 -07:00
Shimeng (Simon) Wang
fbaaa74d8c Merge "Fix height measure state." 2011-06-09 15:56:19 -07:00
Irfan Sheriff
382d1473f4 Merge "WifiWatchdogService refactor" 2011-06-09 15:47:08 -07:00
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
Marco Nelissen
a5dbcdf0fc am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
  Make sure we don't read from invalid fds
 2011-06-09 11:41:57 -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
Marco Nelissen
ff86daf56a am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
 2011-06-09 10:36:24 -07:00
Gilles Debunne
17f04d4305 Merge "Add SwitchPreference" 2011-06-09 10:25:25 -07:00