Commit Graph

5678 Commits

Author SHA1 Message Date
Jeff Hamilton
c4cbba9c37 am 7d2795c8: Really fix the build.
Merge commit '7d2795c80c70d5eec67da7848ab1aa8deba538e4' into eclair-plus-aosp

* commit '7d2795c80c70d5eec67da7848ab1aa8deba538e4':
  Really fix the build.
2009-09-23 23:28:21 -07:00
Dianne Hackborn
4ab962f0e9 am ffa42480: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a' into eclair-plus-aosp

* commit 'ffa424800d0338b8b894aef2ea1e3e3344cbda7a':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
2009-09-23 23:28:06 -07:00
Chia-chi Yeh
1d32494826 am f11cc96e: Merge change 26793 into eclair
Merge commit 'f11cc96ee837f8b0d530f3a5dd78ffc358727411' into eclair-plus-aosp

* commit 'f11cc96ee837f8b0d530f3a5dd78ffc358727411':
  KeyStore: remove classes used by old keystore.
2009-09-23 22:44:53 -07:00
Chia-chi Yeh
ffbafe8705 am ea09a5b6: Merge change 26791 into eclair
Merge commit 'ea09a5b662e141a1d05c2fa6accd914f7f5904bc' into eclair-plus-aosp

* commit 'ea09a5b662e141a1d05c2fa6accd914f7f5904bc':
  KeyStore: return null when response code indicates an error.
2009-09-23 22:44:40 -07:00
Tammo Spalink
3d6b66255d am 3436eb81: Merge change 26129 into eclair
Merge commit '3436eb81cdd52ed5bfeb64f3240bbeae6760c317' into eclair-plus-aosp

* commit '3436eb81cdd52ed5bfeb64f3240bbeae6760c317':
  Add Phone.getPhoneType() operation.
2009-09-23 22:44:26 -07:00
Android (Google) Code Review
aa83fc8173 Merge change 26793 into eclair
* changes:
  KeyStore: remove classes used by old keystore.
2009-09-24 01:38:42 -04:00
Android (Google) Code Review
e3edfce725 Merge change 26791 into eclair
* changes:
  KeyStore: return null when response code indicates an error.
2009-09-24 01:38:35 -04:00
Android (Google) Code Review
3e68e1c037 Merge change 26129 into eclair
* changes:
  Add Phone.getPhoneType() operation.
2009-09-24 01:37:09 -04:00
Chia-chi Yeh
4424dd7dd5 keystore: remove old implementation and test.
The new tests will be implemented in java.
2009-09-24 13:35:26 +08:00
Jeff Hamilton
7adfe65c92 am 0c23212e: Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7' into eclair-plus-aosp

* commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7':
  Re-hide the contacts APIs, the droiddoc build is failing.
2009-09-23 22:34:33 -07:00
Hung-ying Tyan
ab6ac81c69 am 46a41e0e: Merge change 26786 into eclair
Merge commit '46a41e0e7f95f43aa7251114f12fd5e2b9933bc7' into eclair-plus-aosp

* commit '46a41e0e7f95f43aa7251114f12fd5e2b9933bc7':
  Remove old keystore and related files.
2009-09-23 22:34:16 -07:00
Android (Google) Code Review
7b7c3c1515 Merge change 26786 into eclair
* changes:
  Remove old keystore and related files.
2009-09-24 01:17:01 -04:00
Lorenzo Colitti
2a118eabd1 am 7c5c6076: Merge change 26640 into eclair
Merge commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316' into eclair-plus-aosp

* commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316':
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
2009-09-23 22:09:41 -07:00
Android (Google) Code Review
a6f2728706 Merge change 26640 into eclair
* changes:
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896 section 3.2.2.
2009-09-24 01:03:58 -04:00
Tammo Spalink
31c6e8a81e am b89cfb0f: Merge change 26566 into eclair
Merge commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9' into eclair-plus-aosp

* commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9':
  Conditionalized CDMA-specific test.
2009-09-23 21:50:40 -07:00
Mathias Agopian
e98448f45e am 63e118ed: Merge change 26776 into eclair
Merge commit '63e118ed799f83085e5c6f222c4288576bf13d9c' into eclair-plus-aosp

* commit '63e118ed799f83085e5c6f222c4288576bf13d9c':
  wallpaper: don't erase the background, just to repaint over it. saves 1.7 ms on some hardware
2009-09-23 21:50:28 -07:00
Android (Google) Code Review
2c5bc2b743 Merge change 26566 into eclair
* changes:
  Conditionalized CDMA-specific test.
2009-09-24 00:41:49 -04:00
Android (Google) Code Review
049601e8ee Merge change 26776 into eclair
* changes:
  wallpaper: don't erase the background, just to repaint over it. saves 1.7 ms on some hardware
2009-09-24 00:41:46 -04:00
Jeff Hamilton
eaf77babb9 am 85abdc59: Make the new ContactsContract public.
Merge commit '85abdc59c3a31df6dc6ac4f20e64d5c91fa70023' into eclair-plus-aosp

* commit '85abdc59c3a31df6dc6ac4f20e64d5c91fa70023':
  Make the new ContactsContract public.
2009-09-23 21:21:26 -07:00
Mathias Agopian
5420874105 am da351111: Merge changes 26766,26767 into eclair
Merge commit 'da3511113a674d50008ec1a9ec45bbc5f51424cf' into eclair-plus-aosp

* commit 'da3511113a674d50008ec1a9ec45bbc5f51424cf':
  turn dithering off if it's not needed
  fix [2142193] disable GL_LINEAR when not needed
2009-09-23 19:24:12 -07:00
Xavier Ducrohet
fbfe0c9bee am 3b805d57: Merge change 26616 into eclair
Merge commit '3b805d570716749966b909be16513f882522c58e' into eclair-plus-aosp

* commit '3b805d570716749966b909be16513f882522c58e':
  Add density support to layoutlib so that bitmap are scaled if needed.
2009-09-23 19:24:00 -07:00
Android (Google) Code Review
56aaeb0abb Merge changes 26766,26767 into eclair
* changes:
  turn dithering off if it's not needed
  fix [2142193] disable GL_LINEAR when not needed
2009-09-23 22:17:54 -04:00
Mathias Agopian
401c257fba turn dithering off if it's not needed 2009-09-23 19:16:27 -07:00
Android (Google) Code Review
e5661574a9 Merge change 26616 into eclair
* changes:
  Add density support to layoutlib so that bitmap are scaled if needed.
2009-09-23 22:10:38 -04:00
Mathias Agopian
4b7e866af1 am 8434c536: the boot animation is back! it broke in a recent check-in
Merge commit '8434c5369304e639efe8eab368ca410c589d87c2' into eclair-plus-aosp

* commit '8434c5369304e639efe8eab368ca410c589d87c2':
  the boot animation is back! it broke in a recent check-in
2009-09-23 19:04:28 -07:00
Mathias Agopian
a2fe0a234b fix [2142193] disable GL_LINEAR when not needed 2009-09-23 18:55:02 -07:00
Mike Cleron
54afd30206 am 769de37e: Merge change 26752 into eclair
Merge commit '769de37e2108542f7085536e46ddcd8eab8ad69b' into eclair-plus-aosp

* commit '769de37e2108542f7085536e46ddcd8eab8ad69b':
  Fix 2105956: The nine patch markers for one of the zoom buttons were reversed
2009-09-23 18:41:52 -07:00
Android (Google) Code Review
4327cf612b Merge change 26752 into eclair
* changes:
  Fix 2105956: The nine patch markers for one of the zoom buttons were reversed
2009-09-23 21:27:46 -04:00
Mike Cleron
b9161beaff am 880aaa7f: Merge change 26730 into eclair
Merge commit '880aaa7fe0706dbadbb8f2f6b39b4f3021f74c01' into eclair-plus-aosp

* commit '880aaa7fe0706dbadbb8f2f6b39b4f3021f74c01':
  Fix 2132058: Tweak hdpi textfield assets so they align with buttons
2009-09-23 17:54:25 -07:00
Android (Google) Code Review
69b450fcf2 Merge change 26730 into eclair
* changes:
  Fix 2132058: Tweak hdpi textfield assets so they align with buttons
2009-09-23 20:49:01 -04:00
Joe Onorato
fb2e590df1 am a3007127: Merge change 26728 into eclair
Merge commit 'a30071273a8ee59b300eebe515db86f9070ab4a4' into eclair-plus-aosp

* commit 'a30071273a8ee59b300eebe515db86f9070ab4a4':
  Make the renderscript timing logging available by setting debug.rs.profile=1
2009-09-23 17:34:53 -07:00
Android (Google) Code Review
03a1bf001c Merge change 26728 into eclair
* changes:
  Make the renderscript timing logging available by setting debug.rs.profile=1
2009-09-23 20:27:52 -04:00
Mathias Agopian
6f83bac748 am b5501d0e: Merge change 26719 into eclair
Merge commit 'b5501d0e5ce69a1c06d9f9a871b48db4b4274791' into eclair-plus-aosp

* commit 'b5501d0e5ce69a1c06d9f9a871b48db4b4274791':
  fix simulator build
2009-09-23 17:20:12 -07:00
Android (Google) Code Review
b9ac0eb69d Merge change 26719 into eclair
* changes:
  fix simulator build
2009-09-23 20:11:04 -04:00
Dianne Hackborn
197f360a18 am ce605142: Merge change 26717 into eclair
Merge commit 'ce60514221f2a143a0f85a1c63637d674eaa3d58' into eclair-plus-aosp

* commit 'ce60514221f2a143a0f85a1c63637d674eaa3d58':
  Newer animations.
2009-09-23 17:10:07 -07:00
Mathias Agopian
22b339e01a am 6e35b50e: Merge change 26715 into eclair
Merge commit '6e35b50e8d77ff16ffbcac88f421c7091d1c9b8c' into eclair-plus-aosp

* commit '6e35b50e8d77ff16ffbcac88f421c7091d1c9b8c':
  fix [2133214] STOPSHIP: revert I4a06bb4f: workaround for [2113743] Sholes: frozen then runtime restart going to list view
2009-09-23 17:09:53 -07:00
Android (Google) Code Review
a560844485 Merge change 26717 into eclair
* changes:
  Newer animations.
2009-09-23 20:04:44 -04:00
Ken Shirriff
b67e867ebb am 2cca29a3: Merge change 26711 into eclair
Merge commit '2cca29a333eb2d29d4f7cceb5e73313d7857ca82' into eclair-plus-aosp

* commit '2cca29a333eb2d29d4f7cceb5e73313d7857ca82':
  Fix widget stopListening NPE.
2009-09-23 17:04:37 -07:00
Android (Google) Code Review
bef4524723 Merge change 26715 into eclair
* changes:
  fix [2133214] STOPSHIP: revert I4a06bb4f: workaround for [2113743] Sholes: frozen then runtime restart going to list view
2009-09-23 20:03:41 -04:00
Mathias Agopian
8c0a3d75c8 fix [2133214] STOPSHIP: revert I4a06bb4f: workaround for [2113743] Sholes: frozen then runtime restart going to list view
Revert "workaround for [2113743] Sholes: frozen then runtime restart going to list view"

This reverts commit 4a06bb4f3355b0ef2b76aa883704da9d154c44ae.
2009-09-23 16:59:57 -07:00
Android (Google) Code Review
118abc10b1 Merge change 26711 into eclair
* changes:
  Fix widget stopListening NPE.
2009-09-23 19:55:14 -04:00
Wu-cheng Li
16a2d0fa9a am e6bea600: Change setRotation documentaion.
Merge commit 'e6bea600fe5600017a4824adb14752a5b915d164' into eclair-plus-aosp

* commit 'e6bea600fe5600017a4824adb14752a5b915d164':
  Change setRotation documentaion.
2009-09-23 16:49:19 -07:00
Jim Miller
3bb3e9d16c am 8799b96e: Merge change 26314 into eclair
Merge commit '8799b96ea09d5fdd9904dd9de3002c0a9cd28fdc' into eclair-plus-aosp

* commit '8799b96ea09d5fdd9904dd9de3002c0a9cd28fdc':
  Delay broadcasting ACCOUNTS_CHANGED until we're certain AndroidId is ready.
2009-09-23 16:24:02 -07:00
Android (Google) Code Review
68edc69c60 Merge change 26314 into eclair
* changes:
  Delay broadcasting ACCOUNTS_CHANGED until we're certain AndroidId is ready.
2009-09-23 19:15:29 -04:00
Fred Quintana
bab57ccc1c am 8f1e5981: Merge change 26653 into eclair
Merge commit '8f1e598118d612988ffecfa979778e9aab4ece57' into eclair-plus-aosp

* commit '8f1e598118d612988ffecfa979778e9aab4ece57':
  make the SyncManager listen for backgroun data setting changes and do a sync when the setting is enabled
2009-09-23 16:04:34 -07:00
Mathias Agopian
63820a2947 am 60b69cd7: Merge change 26691 into eclair
Merge commit '60b69cd70e9fe5b6d2d73547748e93287a0a7493' into eclair-plus-aosp

* commit '60b69cd70e9fe5b6d2d73547748e93287a0a7493':
  fix [2132563] stuck in boot animation (framebuffer_device_open: Failed to create flip chain)
2009-09-23 15:59:26 -07:00
Android (Google) Code Review
b2b64c9227 Merge change 26653 into eclair
* changes:
  make the SyncManager listen for backgroun data setting changes and do a sync when the setting is enabled
2009-09-23 18:58:07 -04:00
Android (Google) Code Review
7fb7460fc5 Merge change 26691 into eclair
* changes:
  fix [2132563] stuck in boot animation (framebuffer_device_open: Failed to create flip chain)
2009-09-23 18:50:22 -04:00
Mathias Agopian
dd3423c624 fix [2132563] stuck in boot animation (framebuffer_device_open: Failed to create flip chain) 2009-09-23 15:49:32 -07:00
Dianne Hackborn
bb78192a2a am 9d31e1be: Merge change 26686 into eclair
Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
  Fix broken build.
2009-09-23 15:28:53 -07:00