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

18281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vasu Nori
c9c6101935 am 94dab9b1: fix broken api/current.xml 
Merge commit '94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp

* commit '94dab9b13590b714a7400d513f1e4655c62ddfaf':
  fix broken api/current.xml
 2010-07-17 18:35:21 -07:00
Vasu Nori
450560cf0d am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ContactsContract 
Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283'

* commit 'bbc2b4e69a1788987a8fe959cc0105290b431283':
  add video/audio chat-compatibility modes to ContactsContract
 2010-07-17 18:31:28 -07:00
Vasu Nori
f6164eded5 am 5b31498b: add video/audio chat-compatibility modes to ContactsContract 
Merge commit '5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp

* commit '5b31498ba1f9874f395d80152304512fa4c0144d':
  add video/audio chat-compatibility modes to ContactsContract
 2010-07-17 18:25:20 -07:00
Eric Laurent
54bcb68417 am 2b381aff: am 2c87e9c9: First submission of audio effect library from NXP software. 
Merge commit '2b381affda94c5b17e023768f9f2271c69152838'

* commit '2b381affda94c5b17e023768f9f2271c69152838':
  First submission of audio effect library from NXP software.
 2010-07-17 06:52:16 -07:00
Eric Laurent
c9c41edd92 am 2c87e9c9: First submission of audio effect library from NXP software. 
Merge commit '2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp

* commit '2c87e9c923b0362fabf8c97ff63997542394c428':
  First submission of audio effect library from NXP software.
 2010-07-17 06:46:03 -07:00
Romain Guy
0d4a54fda0 Merge "Add program for linear gradient." 2010-07-16 23:19:19 -07:00
Robert Greenwalt
fe24b2f123 Merge "Fix emulator dns." 2010-07-16 18:38:57 -07:00
Jeff Brown
7853b8bed7 am 3994396b: am d3616592: Fix trackball down and movement bugs. 
Merge commit '3994396b089c36f432a7af5d542ef594142dd09b'

* commit '3994396b089c36f432a7af5d542ef594142dd09b':
  Fix trackball down and movement bugs.
 2010-07-16 17:56:15 -07:00
Jeff Brown
86b92e3654 am d3616592: Fix trackball down and movement bugs. 
Merge commit 'd3616592fe1b315b589766c4b74ce728fc4968f5' into gingerbread-plus-aosp

* commit 'd3616592fe1b315b589766c4b74ce728fc4968f5':
  Fix trackball down and movement bugs.
 2010-07-16 17:53:48 -07:00
Jeff Brown
f26db0d6c5 Fix trackball down and movement bugs. 
Bug: 2823788
Change-Id: Icb0c392b58f7e735614460b5eb87439cb73ac4f2
 2010-07-16 17:46:03 -07:00
Chet Haase
3bedf9cd64 Merge "Fixing view property invalidation issues" 2010-07-16 17:39:44 -07:00
Romain Guy
266bf77c9b Merge "Add plumbing to support gradients in OpenGL renderer." 2010-07-16 17:13:26 -07:00
Jeff Brown
2df1665840 am e2fb11b9: am ace999b0: Ignore attempts to finish events on unregistered channels. 
Merge commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a'

* commit 'e2fb11b9b02518126ace1a998ae7f824fc76068a':
  Ignore attempts to finish events on unregistered channels.
 2010-07-16 16:25:45 -07:00
Hung Dang
4062db3083 am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 
Merge commit 'd652751de782bac7e37916ed5786fcfa637a2be3'

* commit 'd652751de782bac7e37916ed5786fcfa637a2be3':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
 2010-07-16 16:25:27 -07:00
Jamie Gennis
3154334630 am 04b95313: am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 
Merge commit '04b953132edb5482f0aa6d992f89e7016961528c'

* commit '04b953132edb5482f0aa6d992f89e7016961528c':
  Re-use existing Surface objects when reading them from parcels.
 2010-07-16 16:25:23 -07:00
Jeff Brown
e085084dc5 am 7b8df313: am 00ba8844: Fix individual pointer id up/down reporting. 
Merge commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d'

* commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d':
  Fix individual pointer id up/down reporting.
 2010-07-16 16:25:13 -07:00
Scott Main
989ce29b44 am aba4bf19: am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo 
Merge commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633'

* commit 'aba4bf19fbdedb2f4f438895e8165a3b34a15633':
  docs: editorial revisions to Search guide
 2010-07-16 16:25:03 -07:00
Jeff Brown
0f63ddb175 am ace999b0: Ignore attempts to finish events on unregistered channels. 
Merge commit 'ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp

* commit 'ace999b096739d376d4845c0ba94599197ff8477':
  Ignore attempts to finish events on unregistered channels.
 2010-07-16 16:03:07 -07:00
Jean-Baptiste Queru
b387d9de47 Merge "Fix build." 2010-07-16 15:25:26 -07:00
Hung Dang
e5b63e4acd am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 
Merge commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp

* commit 'b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
 2010-07-16 15:18:03 -07:00
Jamie Gennis
4760482810 am c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 
Merge commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp

* commit 'c8c79a654d4ae8e3a883854e19cc2df757f72d82':
  Re-use existing Surface objects when reading them from parcels.
 2010-07-16 15:17:59 -07:00
Hung Dang
9b242faf8b am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 
Merge commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread

* commit '28fe43be5c364a8f7f248a5ac05cf832a83737c2':
  Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
 2010-07-16 15:15:44 -07:00
Jamie Gennis
874da6e438 Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread 2010-07-16 15:14:44 -07:00
Jeff Brown
cd423c4239 am 00ba8844: Fix individual pointer id up/down reporting. 
Merge commit '00ba884436dc8b222ad850c73c936d87bf4e84de' into gingerbread-plus-aosp

* commit '00ba884436dc8b222ad850c73c936d87bf4e84de':
  Fix individual pointer id up/down reporting.
 2010-07-16 15:14:35 -07:00
Hung Dang
fb9b2483c9 Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 2010-07-16 15:13:12 -07:00
Jeff Brown
3cf1c9b844 Fix individual pointer id up/down reporting. 
Fix a minor threading bug in InputManager dump.

Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778
 2010-07-16 15:11:24 -07:00
Romain Guy
0187e14da4 Merge "Optimize textures binding." 2010-07-16 15:09:07 -07:00
Scott Main
99762e5168 am e068b464: am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo 
Merge commit 'e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp

* commit 'e068b46408f3ff390b47dc78ccf10fab76883051':
  docs: editorial revisions to Search guide
 2010-07-16 15:02:30 -07:00
Scott Main
127c21f74a am 2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo 
Merge commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread

* commit '2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1':
  docs: editorial revisions to Search guide
 2010-07-16 14:59:48 -07:00
Scott Main
f044328d09 Merge "docs: editorial revisions to Search guide" into froyo 2010-07-16 14:52:03 -07:00
Romain Guy
b75a776378 Merge "Improve clip support (add intersect, union and replace.)" 2010-07-16 14:13:48 -07:00
The Android Open Source Project
54da4fa244 am 5adfe6c5: merge from open-source master 
Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f'

* commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f':
  Fix the problem that color drawable cache key conflicts another drawable one.
 2010-07-16 14:06:06 -07:00
The Android Open Source Project
352a7b59ed am c9ecd445: merge from open-source master 
Merge commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e'

* commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e':
  Added method getPreferredHttpHost
 2010-07-16 14:01:43 -07:00
The Android Open Source Project
7fd8fbb0c1 merge from open-source master 
Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
 2010-07-16 14:01:37 -07:00
The Android Open Source Project
3923714fcb merge from open-source master 
Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
 2010-07-16 13:58:43 -07:00
The Android Open Source Project
813e868231 am 3a94ab02: merge from open-source master 
Merge commit '3a94ab026f0434624f233e99b1a0aadb9152a09a'

* commit '3a94ab026f0434624f233e99b1a0aadb9152a09a':
  Allow ListPreference summary to use entry
 2010-07-16 13:56:16 -07:00