Cary Clark
4a045a3762
am 6fb27c5a: am 96cfad5d: check for null before calling native webkit from java webview
...
Merge commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217'
* commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217':
check for null before calling native webkit from java webview
2009-09-25 11:24:51 -07:00
Bryan Mawhinney
5675f5b6f8
am 7e74262a: am 82e62668: Merge change 27038 into eclair
...
Merge commit '7e74262ab6b650bd5cca218067de36e42d95952e'
* commit '7e74262ab6b650bd5cca218067de36e42d95952e':
Redraw search autocomplete dropdown after config change.
2009-09-25 11:24:20 -07:00
Bjorn Bringert
243d240467
am 079b824c: am 81d84c0c: am 6266e40a: Better JavaDoc for Activity.onSearchRequested().
...
Merge commit '079b824cf05bee18447ace93958e8f7edcb2cf61'
* commit '079b824cf05bee18447ace93958e8f7edcb2cf61':
Better JavaDoc for Activity.onSearchRequested().
2009-09-25 11:24:11 -07:00
Bryan Mawhinney
c784380d10
am 067e0164: am 42b7af57: Dismiss QSB dialog when doing an in-app global search.
...
Merge commit '067e0164cae268098a5305bbfca401d4e917b78b'
* commit '067e0164cae268098a5305bbfca401d4e917b78b':
Dismiss QSB dialog when doing an in-app global search.
2009-09-25 11:23:53 -07:00
Dianne Hackborn
cd02a278e4
am c6cfd0b0: am 3e2ac884: Fix/improve issue #2142662 : too easy to click a link/item instead of fling
...
Merge commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c'
* commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c':
Fix/improve issue #2142662 : too easy to click a link/item instead of fling
2009-09-25 11:23:26 -07:00
Dianne Hackborn
212770b632
am 7510aba7: am 896b15ab: Merge change 27016 into eclair
...
Merge commit '7510aba7a5a1024394be938c7e8b35de785f7355'
* commit '7510aba7a5a1024394be938c7e8b35de785f7355':
A variety of work on animations.
2009-09-25 11:23:16 -07:00
Mike Cleron
4b0ee97d67
am f45076dd: am fdf53a46: Merge change 26935 into eclair
...
Merge commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d'
* commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d':
Fix bug 2129190
2009-09-25 11:22:49 -07:00
Nick Pelly
561837422a
am b2209a35: am 1a42cfac: Use LM_SECURE when auth && encrypt.
...
Merge commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523'
* commit 'b2209a35af672c086c28fbcf3a5101bbb10eb523':
Use LM_SECURE when auth && encrypt.
2009-09-25 11:16:24 -07:00
Nick Pelly
a0c1abcef6
am a7e508eb: am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable.
...
Merge commit 'a7e508eb55c8f63ff43aea2374a2773893e69321'
* commit 'a7e508eb55c8f63ff43aea2374a2773893e69321':
Bluetooth API: Do not allow apps to programmatically make BT discoverable.
2009-09-25 11:16:17 -07:00
Chih-Chung Chang
0cff245456
am 5e367bfe: am 0665ae22: Merge change 26939 into eclair
...
Merge commit '5e367bfe0726d7d7108279721179dcd6de326ee5'
* commit '5e367bfe0726d7d7108279721179dcd6de326ee5':
Fix 2101425: Camera crashes spontaneously in preview.
2009-09-25 11:15:04 -07:00
Karl Rosaen
7bc6d80c32
am 57869675: am 0808c961: Merge change 26954 into eclair
...
Merge commit '578696753510b06d97e189f533f7115555795c0f'
* commit '578696753510b06d97e189f533f7115555795c0f':
Update layouts to show status (battery, alarm) info on pattern unlock screen. make buttons dark.
2009-09-25 11:14:58 -07:00
Fred Quintana
120d132475
am 63344cae: am 91a00d3a: fix typo
...
Merge commit '63344cae94520d789dbe4002dcc3d6ef45d9a040'
* commit '63344cae94520d789dbe4002dcc3d6ef45d9a040':
fix typo
2009-09-25 11:14:38 -07:00
Fred Quintana
e2f2df4041
am 5dfe9f15: am f5808415: rename misc to birthday
...
Merge commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff'
* commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff':
rename misc to birthday
2009-09-25 11:14:31 -07:00
Daisuke Miyakawa
de6bbe7fc1
am 2f24ab9f: am 4579ed28: Merge change 26944 into eclair
...
Merge commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d'
* commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d':
Add "TYPE=" to type attribute when appropriate.
2009-09-25 11:13:53 -07:00
Wei Huang
4e8804fa54
am 8feefb3e: am d35db5ec: Merge change 26946 into eclair
...
Merge commit '8feefb3e2067cc7d3c5b9c3b776538f264782021'
* commit '8feefb3e2067cc7d3c5b9c3b776538f264782021':
Fix bug#2144742: guard against 0 length encoded string when attaching a 'from' address for MMS.
2009-09-25 11:13:43 -07:00
Daisuke Miyakawa
0b43103b46
am 5b774984: am b7e89e4c: Merge change 26912 into eclair
...
Merge commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c'
* commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c':
Add appendType() utility method.
2009-09-25 11:12:11 -07:00
Nicolas Roard
13e8d6e016
am 08228fda: am dccf22dc: Merge change 26698 into eclair
...
Merge commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae'
* commit '08228fdaffd4b5d29e2b3172cc535b8e2c22baae':
Fix the shortcuts
2009-09-25 11:11:37 -07:00
Bryan Mawhinney
753bc00f15
am cbafa094: am dfb7bc8c: Merge change 26821 into eclair
...
Merge commit 'cbafa094449f9e6646409b6bd26ba11956b32047'
* commit 'cbafa094449f9e6646409b6bd26ba11956b32047':
Make removeOnAccountsUpdateListener cope with null handlers.
2009-09-25 11:11:31 -07:00
Fred Quintana
d0bde7ba9b
am 93bc8cab: am 531e580a: remove the incorrectly located nickname
...
Merge commit '93bc8cab98784851b1bb080b57d059ac35fa619a'
* commit '93bc8cab98784851b1bb080b57d059ac35fa619a':
remove the incorrectly located nickname
2009-09-25 11:11:22 -07:00
Grace Kloba
a0c2e57cc3
am 9f9a0ad5: am f4a36e86: Merge change 26909 into eclair
...
Merge commit '9f9a0ad5744a934a521578511b59566d05ed1784'
* commit '9f9a0ad5744a934a521578511b59566d05ed1784':
Not all WebView's host have permission to read the history.
2009-09-25 11:11:16 -07:00
Dmitri Plotnikov
affabd66e0
am 7f8d14e8: am 6938bb36: Fixing the broken build
...
Merge commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9'
* commit '7f8d14e83241704d6c5d36d3d594931e86dcffb9':
Fixing the broken build
2009-09-25 11:10:38 -07:00
Cary Clark
abb34549b2
am f28ffd06: am f18c5393: set the selection after sending a click
...
Merge commit 'f28ffd0688d83c019e74a7d32759d5734396baa4'
* commit 'f28ffd0688d83c019e74a7d32759d5734396baa4':
set the selection after sending a click
2009-09-25 11:10:08 -07:00
Dmitri Plotnikov
cde981dbac
am 2841a1c1: am f22fc124: Adding timestamp and account to contact-level presence columns.
...
Merge commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08'
* commit '2841a1c18a90522c5a0b875ead6ec0b6795cef08':
Adding timestamp and account to contact-level presence columns.
2009-09-25 11:09:57 -07:00
Daisuke Miyakawa
68bb98fb9f
am cc2465bb: am f2bed60b: Add final to appropriate variables.
...
Merge commit 'cc2465bbd5845fb128963f845589c8a6e41c64de'
* commit 'cc2465bbd5845fb128963f845589c8a6e41c64de':
Add final to appropriate variables.
2009-09-25 11:09:51 -07:00
Daisuke Miyakawa
9bb967ef49
am 577d32a5: am b55e60e1: Fix vCard code.
...
Merge commit '577d32a57d1b21b40015ac202147e00e8243db63'
* commit '577d32a57d1b21b40015ac202147e00e8243db63':
Fix vCard code.
2009-09-25 11:09:40 -07:00
Grace Kloba
069e2dda63
am 0eb9ac8f: am 43f99202: Merge change 26896 into eclair
...
Merge commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2'
* commit '0eb9ac8f5858a9864667749f5de508a38b0c2de2':
ResultTransport needs a default value. If the thread is
2009-09-25 11:09:27 -07:00
Satish Roddom
0bcd7ef6cc
am 3f5db261: am 03d2009b: Merge change 26895 into eclair
...
Merge commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d'
* commit '3f5db2615f2d14632e5acbcfcd983d4373a5970d':
Subject issue in MMS message
2009-09-25 11:09:03 -07:00
Lixin Yue
bbdd9f9d9d
am 2c01a82f: am bfe1297b: Merge change 26869 into eclair
...
Merge commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2'
* commit '2c01a82f53e22d98d652308b9bf6d0b6d14b6ff2':
Add call log support to pim.vcard.VCardComposer
2009-09-25 11:08:34 -07:00
Grace Kloba
d38d3682b2
am 34b9dab1: am bb6aba19: Merge change 26876 into eclair
...
Merge commit '34b9dab1ba1db40378a3f425d0591d17e2fb91be'
* commit '34b9dab1ba1db40378a3f425d0591d17e2fb91be':
Restrict touch to the view height with the title. This
2009-09-25 11:08:05 -07:00
Christopher Tate
c5486b3e7c
am 2b091c88: am 4cc86e1a: Clear the device\'s data from the transport when backup is disabled
...
Merge commit '2b091c882d64947b4dabc08d7284c42b9f051959'
* commit '2b091c882d64947b4dabc08d7284c42b9f051959':
Clear the device's data from the transport when backup is disabled
2009-09-25 11:07:45 -07:00
Karl Rosaen
75ae374510
am 512fb951: am bb339ead: Merge change 26867 into eclair
...
Merge commit '512fb951a15ed45d432515b49acef2c2132195f8'
* commit '512fb951a15ed45d432515b49acef2c2132195f8':
fix bug where siilent mode dissapears when it triggers instead of animating off to the left edge.
2009-09-25 11:07:27 -07:00
Leon Clarke
1a7412c09f
am cf3a289f: am a3a840f9: Merge change 26830 into eclair
...
Merge commit 'cf3a289fedae593b4f0e4a12672efe33866016b5'
* commit 'cf3a289fedae593b4f0e4a12672efe33866016b5':
Coloring clicked-on links
2009-09-25 11:07:21 -07:00
Amith Yamasani
f9721f67e4
am 80ab1b71: am c15255a9: Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
...
Merge commit '80ab1b7198cfad400af752e52541d29ee2f7ce23'
* commit '80ab1b7198cfad400af752e52541d29ee2f7ce23':
Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
2009-09-25 11:06:30 -07:00
Karl Rosaen
1ad17a16d9
am b9393eae: am 9f8d59ee: Merge change 26714 into eclair
...
Merge commit 'b9393eae369ecad7b136153099498787caf7d7cd'
* commit 'b9393eae369ecad7b136153099498787caf7d7cd':
Update RotarySelector to support vertical orientation, and add resolution specific assets (removing old ones).
2009-09-25 11:06:24 -07:00
Jeff Hamilton
073f29e821
am 919dc738: am 13ab701e: Merge change 26856 into eclair
...
Merge commit '919dc7389f7b7558497e766dade90608ac5ef132'
* commit '919dc7389f7b7558497e766dade90608ac5ef132':
Make the new ContactsContract APIs public.
2009-09-25 11:05:59 -07:00
Mike Reed
ec44a6932a
am e493bf79: am 9251c344: Merge change 26851 into eclair
...
Merge commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa'
* commit 'e493bf7985ad4cac7bafcfa788eb281b694967aa':
use new setDither on ImageRef to retain that setting for purgeable images
2009-09-25 11:05:07 -07:00
Daniel Sandler
9a17c56aae
am 5e616a5e: am 1ee4aeaa: New high-res framework assets (drop dated Sep-24).
...
Merge commit '5e616a5eed1e6e22d8914f47ecf70a48ca2ad21a'
* commit '5e616a5eed1e6e22d8914f47ecf70a48ca2ad21a':
New high-res framework assets (drop dated Sep-24).
2009-09-25 11:05:01 -07:00
Daniel Sandler
de22b89d0b
am fec88968: am 3e81ad21: Merge change 26819 into eclair
...
Merge commit 'fec88968389a41fab37b5dece76b95d61db73abf'
* commit 'fec88968389a41fab37b5dece76b95d61db73abf':
Fixes http://b/2143180 (mdpi sdcard notification icons).
2009-09-25 11:04:06 -07:00
Andrei Popescu
d23f7260ea
am 5866935c: am a7beb95e: Merge change 26818 into eclair
...
Merge commit '5866935c1bb0f53f8683d617f5cd7af8a78ed544'
* commit '5866935c1bb0f53f8683d617f5cd7af8a78ed544':
Add possibility to customize the chooser dialog used to allow the user to choose the application for sharing a link.
2009-09-25 11:02:57 -07:00
Ben Murdoch
e57f24d3a0
am 223cb4fb: am d421995f: Fix parsing of HTTP Date years.
...
Merge commit '223cb4fb4a2e2f6ed8f841564cd951a5c083ffd1'
* commit '223cb4fb4a2e2f6ed8f841564cd951a5c083ffd1':
Fix parsing of HTTP Date years.
2009-09-25 11:02:47 -07:00
Daisuke Miyakawa
83a54b479b
am 3adab9fc: am 23703f16: Merge change 26732 into eclair
...
Merge commit '3adab9fcfffa57dd45e9ccace5e21123158e489b'
* commit '3adab9fcfffa57dd45e9ccace5e21123158e489b':
Make ContactStruct explicitly set RawContacts.ACCOUNT_NAME and RawContacts.ACCOUNT_TYPE to null.
2009-09-25 11:02:26 -07:00
Jeff Sharkey
d037929626
am cc582a8e: am 63697af8: Generalize DELAY_STARRED_UPDATE location.
...
Merge commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2'
* commit 'cc582a8ee16de778439a2b6b793d88cf1b7f0de2':
Generalize DELAY_STARRED_UPDATE location.
2009-09-25 11:02:20 -07:00
Jeff Sharkey
3a322c9448
am dfd2f611: am 26d48eb3: Add Groups query parameters for delaying STARRED update.
...
Merge commit 'dfd2f6112ea497506aa4f636f6f8eb746c294b3c'
* commit 'dfd2f6112ea497506aa4f636f6f8eb746c294b3c':
Add Groups query parameters for delaying STARRED update.
2009-09-25 11:02:10 -07:00
Dianne Hackborn
1bf5a19216
am ad8d9dfb: am ffa42480: Fix issue #2133206 : dialogs/menus should auto-dismiss when screen turns off
...
Merge commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7'
* commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7':
Fix issue #2133206 : dialogs/menus should auto-dismiss when screen turns off
2009-09-25 11:01:14 -07:00
Jeff Hamilton
a5215089d5
am f4c102c4: am 0c23212e: Re-hide the contacts APIs, the droiddoc build is failing.
...
Merge commit 'f4c102c4a834dd17265780b2694759b113863c98'
* commit 'f4c102c4a834dd17265780b2694759b113863c98':
Re-hide the contacts APIs, the droiddoc build is failing.
2009-09-25 11:00:22 -07:00
Lorenzo Colitti
cfeab40fc3
am 4d5cd955: am 7c5c6076: Merge change 26640 into eclair
...
Merge commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0'
* commit '4d5cd955423a6b0cb54c9e3030f4415db3e0b1e0':
Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
2009-09-25 11:00:02 -07:00
Mathias Agopian
12b25b1289
am ed4efca6: am 63e118ed: Merge change 26776 into eclair
...
Merge commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f'
* commit 'ed4efca6415bafcdc4df1b23d9d658c07883815f':
wallpaper: don't erase the background, just to repaint over it. saves 1.7 ms on some hardware
2009-09-25 10:59:41 -07:00
Jeff Hamilton
8240258627
am 259540ad: am 85abdc59: Make the new ContactsContract public.
...
Merge commit '259540ad8d6219fb09d2c55b0486139028dc68d0'
* commit '259540ad8d6219fb09d2c55b0486139028dc68d0':
Make the new ContactsContract public.
2009-09-25 10:59:16 -07:00
Mike Cleron
481509f0cb
am 99961218: am 769de37e: Merge change 26752 into eclair
...
Merge commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da'
* commit '99961218ed0ed9d64e533c2d0e377b3cf75f34da':
Fix 2105956: The nine patch markers for one of the zoom buttons were reversed
2009-09-25 10:56:56 -07:00
Mike Cleron
3b3dba5871
am f12c6f30: am 880aaa7f: Merge change 26730 into eclair
...
Merge commit 'f12c6f3015a6b42cb487ec5e94e764a8fd03e2fd'
* commit 'f12c6f3015a6b42cb487ec5e94e764a8fd03e2fd':
Fix 2132058: Tweak hdpi textfield assets so they align with buttons
2009-09-25 10:56:24 -07:00