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

18317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
a9c979ad8f am 98f8e0cb: am ff7049ab: Remove some debug logging that I accidentally committed. 
Merge commit '98f8e0cbaa19b4a045e6f201290e731ddfad67ba'

* commit '98f8e0cbaa19b4a045e6f201290e731ddfad67ba':
  Remove some debug logging that I accidentally committed.
 2010-07-19 16:35:26 -07:00
Jamie Gennis
26dad22920 am ff7049ab: Remove some debug logging that I accidentally committed. 
Merge commit 'ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp

* commit 'ff7049ab2886acc73e145367118646f7741ce333':
  Remove some debug logging that I accidentally committed.
 2010-07-19 16:33:11 -07:00
Jack Palevich
87449dbcc1 Merge "An application version of the GL test." 2010-07-19 16:28:56 -07:00
Jack Palevich
eb69d2ae19 An application version of the GL test. 
Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
 2010-07-19 16:27:54 -07:00
Mike Lockwood
a4cd7f43ba Merge "Add support for emulating external storage on devices with no SD card" 2010-07-19 16:09:40 -07:00
Jamie Gennis
ac07cd613f Remove some debug logging that I accidentally committed. 
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
 2010-07-19 16:09:26 -07:00
Winson Chung
d155c9acf2 Merge "Fixing build breakage due to misnamed javadoc variable." 2010-07-19 16:07:33 -07:00
Adam Powell
1e16c95049 Merge "Fix docs for MenuItem#setShowAsAction" 2010-07-19 15:52:02 -07:00
Adam Powell
423a9540ed Merge "Fix bug 2852909 - screen density for contextual action bar" 2010-07-19 15:48:53 -07:00
Jason Sams
29a926cded Merge "Threading RS ForEach." 2010-07-19 15:39:05 -07:00
Mason Tang
b081ca8b91 Merge "Added support for full-text search in Calendar" 2010-07-19 15:32:45 -07:00
Vasu Nori
9127755c43 am 3766ed3e: am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 
Merge commit '3766ed3eed6be0a9e78193166bab64bf25f02e81'

* commit '3766ed3eed6be0a9e78193166bab64bf25f02e81':
  fix javadoc error which breaks SDK build in gingerbread
 2010-07-19 15:32:10 -07:00
Vasu Nori
0c7f4e5e81 am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
 2010-07-19 15:29:10 -07:00
Vasu Nori
9f63ea27d5 Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 2010-07-19 15:26:39 -07:00
The Android Open Source Project
10dd5ff7cf am 535f6f67: ignore from open-source master 
Merge commit '535f6f67ecfb16bbdc3d9adf8867e3c91be005fc'

* commit '535f6f67ecfb16bbdc3d9adf8867e3c91be005fc':
  Remove the window from being a target for motion events when it is destroyed.
 2010-07-19 15:22:40 -07:00
The Android Open Source Project
f0c6f6437d ignore from open-source master 
Change-Id: Id828527be6c49886f3e40cc2dbe61a5c9c965e71
 2010-07-19 15:19:44 -07:00
Winson Chung
1e348fa20c Merge "Initial changes to allow collections in widgets." 2010-07-19 15:02:33 -07:00
Scott Main
04c52a778b am 3dfa6ec5: am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 
Merge commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9'

* commit '3dfa6ec5f3446c0819619aed6accc593f235cdc9':
  docs: add troubleshooting to eclipse guide about restarting adb
 2010-07-19 14:57:29 -07:00
Scott Main
4501daf0f2 am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 
Merge commit '945ac54da56f79c8407c0111d6ded25afcc159fc' into gingerbread-plus-aosp

* commit '945ac54da56f79c8407c0111d6ded25afcc159fc':
  docs: add troubleshooting to eclipse guide about restarting adb
 2010-07-19 14:52:35 -07:00
Scott Main
dfe85d8b12 am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 
Merge commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread

* commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d':
  docs: add troubleshooting to eclipse guide about restarting adb
 2010-07-19 14:50:32 -07:00
Scott Main
7125c105c4 Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 2010-07-19 14:42:13 -07:00
Vasu Nori
dfb66e6de3 Merge "fix javadoc error" 2010-07-19 14:13:57 -07:00
Danica Chang
6953ae1fb4 am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 
Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'

* commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
 2010-07-19 13:52:38 -07:00
Danica Chang
fc17349f38 am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp

* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
 2010-07-19 13:50:49 -07:00
Danica Chang
4978e7814f Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 2010-07-19 13:47:50 -07:00
John Wang
d68bce695c Merge "Handle call list in CallManager." 2010-07-19 13:42:37 -07:00
The Android Open Source Project
0c6454b27f am 27dfb307: merge from open-source master 
Merge commit '27dfb3070adc90ddfcc398a352de1741f52add03'

* commit '27dfb3070adc90ddfcc398a352de1741f52add03':
  Replaced deprecated calls to setButton and setButton2
 2010-07-19 12:54:10 -07:00
The Android Open Source Project
29bff32cc0 merge from open-source master 
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
 2010-07-19 12:49:39 -07:00
The Android Open Source Project
544664b2b0 am 9ab60279: merge from open-source master 
Merge commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6'

* commit '9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6':
  Replaced deprecated setButton Methodcalls
 2010-07-19 12:48:47 -07:00
Fabrice Di Meglio
fbd33fda52 Merge "Fix bug #2846543 Delete HIDDEN column from the "Calendars" table" 2010-07-19 12:30:01 -07:00
The Android Open Source Project
d5ffb200b6 merge from open-source master 
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
 2010-07-19 12:17:53 -07:00
Mike Lockwood
fed678ae12 Merge "MTP: Only send events to host if we have an open session." 2010-07-19 11:31:54 -07:00
Mike Lockwood
f7572d8d33 Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns" 2010-07-19 11:31:38 -07:00
Andy McFadden
099cacfedc Merge "Fix sim-eng build." 2010-07-19 11:27:08 -07:00
Romain Guy
499bcdb41c Merge "Replaced deprecated calls to setButton and setButton2" 2010-07-19 10:30:16 -07:00
Romain Guy
7b2e5b69d9 Merge "Replaced deprecated setButton Methodcalls" 2010-07-19 10:29:59 -07:00
Xavier Ducrohet
e53033d6c5 am 0a0bb953: (-s ours) am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge. 
Merge commit '0a0bb953f0198e738e3e15a869af21a66a442466'

* commit '0a0bb953f0198e738e3e15a869af21a66a442466':
  Fix the layoutlib Paint.set(Paint) method. Do not merge.
 2010-07-19 10:25:22 -07:00
Eric Laurent
10880164d7 am 3c6ea955: am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread 
Merge commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57'

* commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57':
  Fixed problems in audio effect volume control.
 2010-07-19 10:23:00 -07:00
Xavier Ducrohet
32afe04a54 am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge. 
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp

* commit '80e62ac61c297452c003919f71c4dcd7063d1b43':
  Fix the layoutlib Paint.set(Paint) method. Do not merge.
 2010-07-19 10:22:59 -07:00
Eric Laurent
07b9d4c5de am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread 
Merge commit '7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp

* commit '7203272f35e40bf9d4b76f1b2f9b0077738df118':
  Fixed problems in audio effect volume control.
 2010-07-19 10:19:49 -07:00
Eric Laurent
b04f72e609 Merge "Fixed problems in audio effect volume control." into gingerbread 2010-07-19 10:13:27 -07:00
The Android Open Source Project
a77234f10e am 3d02b48b: merge from open-source master 
Merge commit '3d02b48bd95293c767563729264f007dbcff82b3'

* commit '3d02b48bd95293c767563729264f007dbcff82b3':
  Fix the layoutlib Paint.set(Paint) method.
 2010-07-19 09:11:17 -07:00
Adam Bliss
4ce17a8e24 am 27ef0f73: am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread 
Merge commit '27ef0f732c5a97ba88a699b7490045e5370cf51f'

* commit '27ef0f732c5a97ba88a699b7490045e5370cf51f':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
 2010-07-19 09:07:53 -07:00
The Android Open Source Project
cc0820bfcd merge from open-source master 
Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
 2010-07-19 09:04:02 -07:00
Adam Bliss
1045ed607e am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread 
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp

* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
 2010-07-19 08:36:26 -07:00
Adam Bliss
39a9bd6d49 Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread 2010-07-19 08:09:19 -07:00
Maksymilian Osowski
65b12e05bf Merge "Added the LayoutTestsRunner class that is responsible for running the tests. Also, added some methods to FileFilter." 2010-07-19 04:09:24 -07:00
James Dong
4fee4194a4 am 5e782937: am faf775e7: Fix simulator build (1st attempt) 
Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74'

* commit '5e782937ead3042255d83f9c1192f2cc7b688d74':
  Fix simulator build (1st attempt)
 2010-07-18 15:08:52 -07:00
James Dong
0fa9b27cfa am faf775e7: Fix simulator build (1st attempt) 
Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp

* commit 'faf775e772e329e821d81ba735474df097b1e1e9':
  Fix simulator build (1st attempt)
 2010-07-18 15:03:15 -07:00
Vasu Nori
88e12eff70 am d773bbd7: am 94dab9b1: fix broken api/current.xml 
Merge commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f'

* commit 'd773bbd785aee50c84fe780031c5c796d4ddec9f':
  fix broken api/current.xml
 2010-07-17 19:25:56 -07:00