The Android Open Source Project
627356cee4
am d6c0bb0f: merge from open-source master
...
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken
* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
Removed Calls to deprecated APIs
2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f
merge from open-source master
...
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
Romain Guy
2b9a49a30d
Merge "Removed Calls to deprecated APIs"
2010-05-19 00:01:02 -07:00
Dianne Hackborn
74323fd1ab
Update NativeActivity to allow direct surface access.
...
No actual native API for using a surface, but it's a step.
Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
2010-05-18 18:16:35 -07:00
Suchi Amalapurapu
4ec730cabb
am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
...
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken
* commit '7361b7410f2427022cc8917b00553dc26107cded':
Uncomment a test that was marked as STOPSHIP
2010-05-18 14:55:48 -07:00
Jaikumar Ganesh
c4bdb6d5a0
am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken
* commit 'ea6f6755ce15133238938bd9626b69e5f655a49c':
Removing STOPSHIP logs.
2010-05-18 14:53:39 -07:00
Suchi Amalapurapu
7361b7410f
am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
...
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
2010-05-18 14:53:37 -07:00
Suchi Amalapurapu
4a0823e548
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ea6f6755ce
am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
ef95acebdc
Merge "Removing STOPSHIP logs." into froyo
2010-05-18 14:48:05 -07:00
Suchi Amalapurapu
fb7bacf6ba
Uncomment a test that was marked as STOPSHIP
...
Add MediumTest tag
Change-Id: I0699d168d7ec70c076f4713e0e405c0779a290c6
2010-05-18 14:39:20 -07:00
Jaikumar Ganesh
af21fa61c2
Removing STOPSHIP logs.
...
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
2010-05-18 14:36:48 -07:00
Suchi Amalapurapu
3d802ef73b
am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
...
Merge commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken
* commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
Fix 2641875
2010-05-18 13:17:58 -07:00
Suchi Amalapurapu
aa4db173a2
am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
...
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp
* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
Fix 2641875
2010-05-18 13:16:13 -07:00
Suchi Amalapurapu
9a212adcff
Fix 2641875
...
Initialize the cache path only if the container exists.
This did exist before but was somehow removed.
Fix a known test failure as well.
Change-Id: I63219369b0e7abca4919fbde2a04035a0fea9e35
2010-05-18 11:31:50 -07:00
Dianne Hackborn
dc8a7f69d7
Add new API to take over a window's Surface.
...
Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
2010-05-18 10:46:33 -07:00
The Android Open Source Project
400907086a
am 4547e528: merge from open-source master
...
Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken
* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
Removed Calls to deprecated APIs and unused Imports
2010-05-18 09:21:28 -07:00
The Android Open Source Project
4547e5284e
merge from open-source master
...
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
2010-05-18 09:18:37 -07:00
Scott Main
8473259ddb
am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
2010-05-18 09:07:39 -07:00
Scott Main
74e151c54c
am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
2010-05-18 09:02:09 -07:00
Scott Main
e3b9f8b9b2
docs: fix markup error
...
Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
2010-05-18 08:43:11 -07:00
Scott Main
9719fe11a1
am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
...
Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken
* commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9':
docs: revise webview description and add info for targeting screen densities
2010-05-17 18:04:07 -07:00
Scott Main
fbb285e67f
am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
...
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
2010-05-17 18:01:28 -07:00
Scott Main
8b3cea01bf
docs: revise webview description and add info for targeting screen densities
...
Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
2010-05-17 17:48:30 -07:00
Xia Wang
58e49a5040
Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken
2010-05-17 16:26:32 -07:00
Mike Lockwood
c5859388bd
am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
...
Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken
* commit '3e9e9696f147c8df1236c1d7aa9496124864a81c':
Resurrect flashlight support in obsolete IHardwareService Binder API.
2010-05-17 14:59:39 -07:00
Mike Lockwood
3e9e9696f1
am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
...
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp
* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
Resurrect flashlight support in obsolete IHardwareService Binder API.
2010-05-17 14:56:53 -07:00
Mike Lockwood
eb9cbb8fdd
Resurrect flashlight support in obsolete IHardwareService Binder API.
...
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.
Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-17 17:47:20 -04:00
Kenny Root
0b27542312
am 8ea405d1: am cfa2de30: Import revised translations
...
Merge commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a' into kraken
* commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a':
Import revised translations
2010-05-17 13:53:44 -07:00
Jean-Baptiste Queru
9eb7a72253
resolved conflicts for merge of f7fb5331 to kraken
...
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
2010-05-17 13:50:32 -07:00
Christian Mehlmauer
15d24708b1
Removed Calls to deprecated APIs and unused Imports
...
Change-Id: Ib26783ca1d6c345cc91aa3ab5b9654f5316c78a0
2010-05-17 21:27:27 +02:00
Christian Mehlmauer
746a95ab71
Removed Calls to deprecated APIs
...
Change-Id: I3f9b6a8d3c8a050156a6cc7ea0eb9de33b82f79a
2010-05-17 21:16:20 +02:00
Xia Wang
0b90d76ef8
ConnectivityManagerTestActivity can be launched from launcher.
...
Help to track bug 2680352.
Add a resource file for string.
Corrent some typos.
Change-Id: I42fefe49c360168ec807ed82dc220ab68681d14e
2010-05-17 12:08:05 -07:00
Kenny Root
8ea405d196
am cfa2de30: Import revised translations
...
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp
* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
Import revised translations
2010-05-17 11:37:35 -07:00
Kenny Root
cfa2de303e
Import revised translations
...
Change-Id: Id6bd3011874ff8544a030473cc994f9a0201c97d
2010-05-17 11:18:04 -07:00
The Android Open Source Project
f7fb5331e5
merge from open-source master
...
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
2010-05-17 08:56:54 -07:00
Romain Guy
c4fee63301
Merge "Fixing indeterminate progress bar animation state."
2010-05-15 12:34:05 -07:00
David Sobreira Marques
52a35433cf
Fixing indeterminate progress bar animation state.
...
When showing a progress bar instance more than once
it will not animate after the first time.
Change-Id: I5104c551d561755005e533f2ab5257454567bf71
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
2010-05-15 16:10:18 -03:00
Wu-cheng Li
e339c5edbe
Add camera focus distances API.
...
Applications can use this API to estimate the distance
between the subject and the camera.
bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
2010-05-15 12:40:54 +08:00
Scott Main
6c034325a8
am 6d8e4fd8: am b83a283a: docs: add dev guide for backup
...
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken
* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
docs: add dev guide for backup
2010-05-14 11:56:14 -07:00
Scott Main
6d8e4fd83b
am b83a283a: docs: add dev guide for backup
...
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp
* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
docs: add dev guide for backup
2010-05-14 11:53:44 -07:00
Scott Main
b83a283ac1
docs: add dev guide for backup
...
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
2010-05-14 11:47:42 -07:00
The Android Open Source Project
db20eeb246
am 9167ba50: merge from open-source master
...
Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken
* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
Corrected debug message in WindowManager
Put the wifi status icon in the right place.
2010-05-14 09:15:41 -07:00
The Android Open Source Project
9167ba50e4
merge from open-source master
...
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
2010-05-14 09:11:31 -07:00
Joe Onorato
1b44ebda70
Merge "Put the wifi status icon in the right place."
2010-05-13 16:33:22 -07:00
Suchi Amalapurapu
3f5ed04f7f
am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
...
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken
* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
Fix 2672155
2010-05-13 16:05:54 -07:00
Suchi Amalapurapu
b63ea5f784
am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
...
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp
* commit 'c928a11e34678296511d5ea34582292be7368618':
Fix 2672155
2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34
Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070
Fix 2672155
...
Check the code path when enabling disabling packages.
Add unit test
Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
2010-05-13 15:48:39 -07:00
Nick Kralevich
cf67d18a1d
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-13 15:35:48 -07:00
