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

34740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
964ce8d835 Merge "More compatibility mode improvements." into honeycomb-mr2 2011-05-24 19:07:55 -07:00
Ying Wang
acc8b13a3b Merge "Fix intermediate src dir for framework.jar" 2011-05-24 16:27:17 -07:00
Chet Haase
c62befcd5f Merge "Add more functionality to ViewPropertyAnimator." 2011-05-24 16:07:02 -07:00
Andreas Huber
f6afc90502 Merge "Make sure all references to the decoder plugin are accounted for" 2011-05-24 15:58:09 -07:00
Andreas Huber
337d887f09 Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer" 2011-05-24 15:56:42 -07:00
Chet Haase
fc5eac2b68 Merge "Add ability to transition parent hierarchy in layout transitions" 2011-05-24 15:55:15 -07:00
Shimeng (Simon) Wang
c2bc3099b1 Merge "Simplify viewport logic in webviewcore and zoom-manager." 2011-05-24 15:27:14 -07:00
Romain Guy
74fb159816 Merge "Code cleanup." 2011-05-24 15:00:52 -07:00
Shimeng (Simon) Wang
ca3482c9b0 Merge "Use fixed viewport for all devices in wide viewport mode." 2011-05-24 14:42:44 -07:00
Jeff Brown
24b3ca7d83 Merge "Disable pointer debug logging." 2011-05-24 14:42:18 -07:00
Jeff Brown
96c4b900e8 Merge "Input device protocol enhancements." 2011-05-24 14:39:53 -07:00
Jeff Brown
50f160901c Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-05-24 14:26:18 -07:00
Jason parks
d9436839c8 Merge "Add public API to do NDEF push." 2011-05-24 13:49:51 -07:00
Jeffrey Tinker
0bf285186e am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'c41a17de2b2e80f246adeef4962073916dcfff0b':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-24 12:57:22 -07:00
Mike Lockwood
05ae4cbf66 am 859443f2: am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '859443f2a4d6a2b72c3e9c75720d32d4e4c09489':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-24 12:57:17 -07:00
Amith Yamasani
53b228eb5e am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit 'fcdbcf9174f7a5404da4514b71041c3d37692d15':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-24 12:57:08 -07:00
Mike Lockwood
f38b2edd3e am 49b9449b: am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-24 12:56:56 -07:00
John Reck
6b81725890 am f656d950: (-s ours) am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit 'f656d95078fbcb65df7753ba8c04679c5389e15c':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-24 12:56:32 -07:00
Dianne Hackborn
627147ac99 Merge "resolved conflicts for merge of bbca8133 to master" 2011-05-24 12:44:07 -07:00
Jeff Brown
95e24e04e0 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: I4552501c693716b14714afb5c5248edaca9547ab
 2011-05-24 12:01:25 -07:00
RoboErik
4120eaaad5 Merge "Add original_id definition for cal db v301" 2011-05-24 11:34:45 -07:00
Dianne Hackborn
3ae00fabc7 resolved conflicts for merge of bbca8133 to master 
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
 2011-05-24 11:27:11 -07:00
Kristian Monsen
f7636e9668 am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2 
* commit '18a259fe37861a78632a0667d746ea7d06356ced':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
 2011-05-24 11:22:39 -07:00
Kristian Monsen
3493a191b0 am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2 
* commit '36ac304c6e62dbb1caaf729c70d7aa956aff63be':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
 2011-05-24 11:19:00 -07:00
Kristian Monsen
4994521abe Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2 2011-05-24 11:16:39 -07:00
John Reck
ea4384a2e6 am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 
* commit 'dc8a53a7db91ac23d2b213dc5cf758d64bd880be':
  Update the Desktop UA to Chrome
 2011-05-24 11:10:00 -07:00
John Reck
f6fcd16afe am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 
* commit '2959916b13165f56431f3993bd6b16364032af14':
  Update the Desktop UA to Chrome
 2011-05-24 11:06:38 -07:00
John Reck
79b4767c7b Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 2011-05-24 11:03:11 -07:00
Steve Block
0112f524e1 Merge "In DRT2, correctly handle the case of zero tests" 2011-05-24 10:55:17 -07:00
Steve Block
90011b69ff Merge changes Ibe495cdc,I6f8e5745 
* changes:
  Update DRT2 to reflect WebKit code movement
  Add extra error handling to DRT2 launcher script
 2011-05-24 10:48:21 -07:00
Wink Saville
d910297ba5 am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 
* commit '543c3146cb011380e4328e049abf97bc797db95a':
  Handle ProvideLocalInfo stk command.
 2011-05-24 10:10:13 -07:00
Wink Saville
4069906902 Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 2011-05-24 10:06:58 -07:00
Gilles Debunne
7573a45c2b Merge "Made getOffsetForPosition public in TextView." 2011-05-24 09:26:44 -07:00
Gilles Debunne
9456922422 Merge "TextView uses floats for touch event positions." 2011-05-24 09:26:14 -07:00
Gilles Debunne
584cebdfee Merge "Added a new flag in TextView to disable Suggestions." 2011-05-24 09:25:52 -07:00
TK MUN
30006daf18 am 98a8231e: (-s ours) am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received 
* commit '98a8231e838d7d624c5862d81d1975ef4f8d0d57':
  DO NOT MERGE SystemUI: update signal level when broadcast is received
 2011-05-24 08:44:12 -07:00
Wink Saville
f14c9f7b90 am 9a8ea20d: am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 
* commit '9a8ea20d4b3975d3f771364fb9f2272c32f8cad1':
  Map multiple apnType to one DataConnection fixes.
 2011-05-24 08:42:10 -07:00
Wink Saville
fb530441a4 am b1817383: am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE 
* commit 'b1817383050986413805fbbf2c1cc5c03417574d':
  Data Connection: Use Alarm for all delayed data retries.
 2011-05-24 08:42:05 -07:00
Shimeng (Simon) Wang
af61137fab am f55a00b1: am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer. 
* commit 'f55a00b1b86c58d78a4c2812d00e1b61d03f520a':
  Simplify browser pause/resume logic to avoid stuck timer.
 2011-05-24 08:41:37 -07:00
James Dong
e09d1ae671 resolved conflicts for merge of d5762583 to master 
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
 2011-05-24 08:04:45 -07:00
Xavier Ducrohet
69a54910a3 am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '46e802e9c12befcd477e59437c5de3f0889aef4e':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-24 02:57:37 -07:00
Xavier Ducrohet
15498dbaa1 am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit 'ea182704b60551a9bd7760aa9d206ca7a7e407b8':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-24 02:57:31 -07:00
Xavier Ducrohet
48a1df1192 am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit '162dd490cd0b502c717db59300b3fd902f76710a':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-24 02:57:11 -07:00
Kazuhiro Ondo
0fcce06586 am 6056e326: am f96a6150: Data reconnection issue after airplane mode 
* commit '6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e':
  Data reconnection issue after airplane mode
 2011-05-24 02:56:15 -07:00
Kazuhiro Ondo
24e3415293 am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links 
* commit '8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e':
  GSM DCT: Update poll stats to support multi-links
 2011-05-24 02:56:08 -07:00
Wink Saville
7f5ed6d440 am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change 
* commit '7abbf93c854cd7d272183b674373e989a05da6dd':
  Tear down connection with unwanted linkproperty change
 2011-05-24 02:38:17 -07:00
Wink Saville
bfa99fe863 am f7bc0e28: am 16e8d22b: Fix build. 
* commit 'f7bc0e28bf66c20ef233a161cd1d50a009013ab0':
  Fix build.
 2011-05-24 00:39:54 -07:00
Irfan Sheriff
af981a43af am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE 
* commit '9a7376396ccd272d4be429373e06ae64fe096380':
  Clear network id when invalid
 2011-05-23 22:33:33 -07:00
Irfan Sheriff
88c0592727 Merge "Clear network id when invalid" into honeycomb-LTE 2011-05-23 22:30:33 -07:00
Wink Saville
d434d03193 am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE 
* commit 'f8d70b14e4285d17d83cc4853f50b44d6a55fbc7':
  Notify RIL that PDP reset is triggered due to data stall
 2011-05-23 20:49:05 -07:00