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

35498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
a0d8e424fd am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '8821ba860693f5206c56ae727a4231e4d6f0a735':
  Ummm...  f*, stop breaking the build.
 2011-06-09 16:14:12 -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
Dianne Hackborn
199512446d am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Dianne Hackborn
3bbe6fb6b2 am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:02:02 -07:00
Shimeng (Simon) Wang
fbaaa74d8c Merge "Fix height measure state." 2011-06-09 15:56:19 -07:00
Dianne Hackborn
729fc387b0 Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 2011-06-09 15:55:54 -07:00
Robert Greenwalt
fd8454ebbf am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE 
* commit '75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22':
  Set locale based on SIM preferred language.
 2011-06-09 15:54:45 -07:00
Robert Greenwalt
f2f8aee7c3 Merge "Set locale based on SIM preferred language." into honeycomb-LTE 2011-06-09 15:48:16 -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
Dianne Hackborn
d4bfc93113 Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -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
James Dong
4be896794d am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:50:25 -07:00
Mike Lockwood
2370765e50 am e502c536: am b3174c46: UsbService: Fix JNI reference leak 
* commit 'e502c5364f8e715eb0da54441460b8f3cb76b7ff':
  UsbService: Fix JNI reference leak
 2011-06-09 12:50:23 -07:00
Justin Ho
0f5c3324c1 am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '9b0a8f9a92b7b4579ecf5973d3fe61da7950fa93':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 12:50:10 -07:00
Xavier Ducrohet
01aa602b60 am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '2e0f71181792780b55826bcc562ae79951e76f1b':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 12:49:55 -07:00
Brian Carlstrom
a6d34641a4 Merge "Implement android.webkit.BrowserFrame.requestClientCert" 2011-06-09 12:36:54 -07:00
Conley Owens
50b034725b am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:21:05 -07:00
Adam Powell
1529e14fd2 resolved conflicts for merge of fb339016 to master 
Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac
 2011-06-09 12:15:10 -07:00
Conley Owens
7521344df2 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:14:11 -07:00
James Dong
9266ee53dc am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:03:52 -07:00
Mike Lockwood
ed158883f2 am b3174c46: UsbService: Fix JNI reference leak 
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
  UsbService: Fix JNI reference leak
 2011-06-09 12:01:31 -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
James Dong
f98f69241f Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -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
Conley Owens
c66e2523b9 Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -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