Commit Graph

3405 Commits

Author SHA1 Message Date
Raphael
a64b9fcdcd am d80d98a5: am a4ebc122: am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit 'd80d98a5591a68fff9f02b768a08c0e1076aa36c'

* commit 'd80d98a5591a68fff9f02b768a08c0e1076aa36c':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 17:00:35 -08:00
Raphael
d80d98a559 am a4ebc122: am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6' into eclair-mr2-plus-aosp

* commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:51:10 -08:00
Raphael
a4ebc12213 am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-mr2

* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:42:10 -08:00
Raphael
4c6d950c99 am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-plus-aosp

* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:24:45 -08:00
Raphael
3de259034c am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair

* commit '8e3442f1b0fc19c8213978d4e7ac005774462297':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:13:41 -08:00
Android (Google) Code Review
8e3442f1b0 Merge change Ic291d534 into eclair-sdk
* changes:
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 19:06:48 -05:00
Raphael
3e9f34498a SDK Manager: refresh sources when HTTP/S pref is changed.
Currently you need to use the Refresh button in the remote page
after you change the HTTP/s setting and many users think
instead they need to close/restart the SDK manager.

Change-Id: Ic291d53459624558910bbc417295df5ddc7b037d
2009-11-06 15:18:57 -08:00
Raphael
098e9de155 am 86df89cf: am 2d2d3408: am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '86df89cf62b4f4f274858b840fa97a50c1a9d50c'

* commit '86df89cf62b4f4f274858b840fa97a50c1a9d50c':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:29:58 -08:00
Raphael
86df89cf62 am 2d2d3408: am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '2d2d34086516a36e8d26f927c75b9944fd07b69f' into eclair-mr2-plus-aosp

* commit '2d2d34086516a36e8d26f927c75b9944fd07b69f':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:18:37 -08:00
Raphael
d833bbd1f0 am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-plus-aosp

* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:09:07 -08:00
Raphael
2d2d340865 am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-mr2

* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:08:28 -08:00
Dan Morrill
3cd199f9a6 Work-in-progress snapshot of the source.android.com (formerly PDK) site
refresh.
2009-11-06 14:04:16 -08:00
Raphael
bf9a70fb1b am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair

* commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:00:55 -08:00
Raphael
ca4603db2f SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d
2009-11-06 13:42:28 -08:00
Xavier Ducrohet
ab566dea57 am 01262b3a: am f0f501ec: am 396a10e4: Merge change I793a35a9 into eclair
Merge commit '01262b3ae709cbe1f141ab8976e4926510fd429d'

* commit '01262b3ae709cbe1f141ab8976e4926510fd429d':
  ADT now launches app as if launched from launcher.
2009-11-06 11:34:55 -08:00
Xavier Ducrohet
01262b3ae7 am f0f501ec: am 396a10e4: Merge change I793a35a9 into eclair
Merge commit 'f0f501ec27a4b37bf06288de808bc083d251921a' into eclair-mr2-plus-aosp

* commit 'f0f501ec27a4b37bf06288de808bc083d251921a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:24:31 -08:00
Xavier Ducrohet
f0f501ec27 am 396a10e4: Merge change I793a35a9 into eclair
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2

* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:15:38 -08:00
Xavier Ducrohet
d0fecc9c49 am 396a10e4: Merge change I793a35a9 into eclair
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-plus-aosp

* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:14:54 -08:00
Android (Google) Code Review
396a10e48d Merge change I793a35a9 into eclair
* changes:
  ADT now launches app as if launched from launcher.
2009-11-06 14:08:24 -05:00
Xavier Ducrohet
efc6be0e33 ADT now launches app as if launched from launcher.
BUG 2243142

Change-Id: I793a35a92cf0f818242e74e4794d74a681b25d83
2009-11-06 10:50:27 -08:00
Xavier Ducrohet
3f27e97385 am 886119f5: am e9373a42: am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit '886119f56de90a5569915be9782de4b69460930a'

* commit '886119f56de90a5569915be9782de4b69460930a':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:46:46 -08:00
Xavier Ducrohet
886119f56d am e9373a42: am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit 'e9373a42114a9ed37dbdc68991250bd40f54552f' into eclair-mr2-plus-aosp

* commit 'e9373a42114a9ed37dbdc68991250bd40f54552f':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:36:18 -08:00
Xavier Ducrohet
e9373a4211 am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-mr2

* commit '7853d243aa0f2947249aa610972d74622cdddd82':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:26:37 -08:00
Xavier Ducrohet
dc84e4c722 am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-plus-aosp

* commit '7853d243aa0f2947249aa610972d74622cdddd82':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:26:19 -08:00
Android (Google) Code Review
7853d243aa Merge change I1fa1ae88 into eclair
* changes:
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 13:15:45 -05:00
Xavier Ducrohet
c48867aab4 Move Tools to rev 5, and ADT to 0.9.5
Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445
2009-11-06 10:05:53 -08:00
Fred Quintana
193b41e32b am ae8ea92c: am a04b9614: am b5723869: Merge change I85aa2b1d into eclair
Merge commit 'ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214'

* commit 'ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214':
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 14:11:53 -08:00
mike ritter
0e6c468b95 am 3fb2d576: am c0446aa9: Merge change I4d2a57bc into eclair-mr2
Merge commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276'

* commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276':
  Moved values into attributes of xml elements where they belong
2009-11-05 14:11:46 -08:00
Fred Quintana
ae8ea92c11 am a04b9614: am b5723869: Merge change I85aa2b1d into eclair
Merge commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1' into eclair-mr2-plus-aosp

* commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1':
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 13:58:54 -08:00
mike ritter
3fb2d576e9 am c0446aa9: Merge change I4d2a57bc into eclair-mr2
Merge commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp

* commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9':
  Moved values into attributes of xml elements where they belong
2009-11-05 13:58:42 -08:00
Fred Quintana
a04b9614ce am b5723869: Merge change I85aa2b1d into eclair
Merge commit 'b57238690e7e4afa66416e3ad25183a576f35075' into eclair-mr2

* commit 'b57238690e7e4afa66416e3ad25183a576f35075':
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 13:53:36 -08:00
Android (Google) Code Review
c0446aa9d2 Merge change I4d2a57bc into eclair-mr2
* changes:
  Moved values into attributes of xml elements where they belong
2009-11-05 16:50:10 -05:00
Fred Quintana
aa04899f44 am b5723869: Merge change I85aa2b1d into eclair
Merge commit 'b57238690e7e4afa66416e3ad25183a576f35075' into eclair-plus-aosp

* commit 'b57238690e7e4afa66416e3ad25183a576f35075':
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 11:28:42 -08:00
Android (Google) Code Review
b57238690e Merge change I85aa2b1d into eclair
* changes:
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 14:16:08 -05:00
Fred Quintana
d7a3ea819d create a test app that allows direct control of a sync adapter for testing purposes
http://b/issue?id=2239791
2009-11-05 11:05:11 -08:00
Xavier Ducrohet
0d3417fd70 am 019eca1a: (-s ours) am 4e97e5da: am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '019eca1a7920da9cf5dc7efebb7d24b86561a989'

* commit '019eca1a7920da9cf5dc7efebb7d24b86561a989':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:35:49 -08:00
Xavier Ducrohet
019eca1a79 am 4e97e5da: am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '4e97e5da372f1be39e9eeccc9cad7a551c164828' into eclair-mr2-plus-aosp

* commit '4e97e5da372f1be39e9eeccc9cad7a551c164828':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:25:12 -08:00
Xavier Ducrohet
4e97e5da37 am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-mr2

* commit '421e8d3353de606444e5350d8feeee8c01c90394':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:15:19 -08:00
Xavier Ducrohet
910cecc910 am 421e8d33: am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-plus-aosp

* commit '421e8d3353de606444e5350d8feeee8c01c90394':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:14:47 -08:00
Xavier Ducrohet
421e8d3353 am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair

* commit '7f305ce77069cf8432374f12392a3ce3a476bdce':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:05:34 -08:00
Xavier Ducrohet
7f305ce770 Ignore hidden files and vi swap files during packaging. (do not merge)
BUG #2233458

This is integrated from eclair.
2009-11-04 14:46:40 -08:00
Bjorn Bringert
29017bbd62 Fix type of _id col in SearchableDictionary
SDK SAMPLE CODE ONLY

Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.

Fixes http://b/issue?id=2219970

Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
2009-11-04 11:31:06 +00:00
Eric Rowe
63367d15bf am a6d49e3a: am 80de9538: Fix bug where monkey always tries to run multiple scripts.
Merge commit 'a6d49e3a2ea9b6b4f4cb01c32fc910ea070db45e'

* commit 'a6d49e3a2ea9b6b4f4cb01c32fc910ea070db45e':
  Fix bug where monkey always tries to run multiple scripts.
2009-11-03 18:53:03 -08:00
Eric Rowe
a6d49e3a2e am 80de9538: Fix bug where monkey always tries to run multiple scripts.
Merge commit '80de953874fd16dae6c89a2949e2fd5a14c1303f' into eclair-mr2-plus-aosp

* commit '80de953874fd16dae6c89a2949e2fd5a14c1303f':
  Fix bug where monkey always tries to run multiple scripts.
2009-11-03 18:42:55 -08:00
Eric Rowe
80de953874 Fix bug where monkey always tries to run multiple scripts.
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
2009-11-03 18:28:51 -08:00
Raphael
83b810834b am 3d18353b: am 0136501f: am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '3d18353bacbce63c87905a6d6e35806d70ecb556'

* commit '3d18353bacbce63c87905a6d6e35806d70ecb556':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:46:16 -08:00
Raphael
3d18353bac am 0136501f: am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp

* commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:35:39 -08:00
Brett Chabot
fd893b5fb0 Fix ADT test data references.
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
2009-11-03 12:34:46 -08:00
Raphael
ddc42e282b am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-plus-aosp

* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:25:25 -08:00
Raphael
0136501f88 am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-mr2

* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:25:07 -08:00