Merge "fix IME bug" into honeycomb
diff --git a/res/raw/favicon_myspace.ico b/res/raw/favicon_myspace.ico
deleted file mode 100644
index 22c46be..0000000
--- a/res/raw/favicon_myspace.ico
+++ /dev/null
Binary files differ
diff --git a/res/raw/favicon_twitter.ico b/res/raw/favicon_twitter.ico
new file mode 100644
index 0000000..00450d4
--- /dev/null
+++ b/res/raw/favicon_twitter.ico
Binary files differ
diff --git a/res/raw/thumb_myspace.png b/res/raw/thumb_myspace.png
deleted file mode 100644
index d6f6e76..0000000
--- a/res/raw/thumb_myspace.png
+++ /dev/null
Binary files differ
diff --git a/res/raw/thumb_twitter.png b/res/raw/thumb_twitter.png
new file mode 100644
index 0000000..95e247f
--- /dev/null
+++ b/res/raw/thumb_twitter.png
Binary files differ
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 3f1b5d6..5d8e85a 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -9,8 +9,8 @@
<item>@raw/thumb_yahoo</item>
<item>@raw/favicon_msn</item>
<item>@raw/thumb_msn</item>
- <item>@raw/favicon_myspace</item>
- <item>@raw/thumb_myspace</item>
+ <item>@raw/favicon_twitter</item>
+ <item>@raw/thumb_twitter</item>
<item>@raw/favicon_facebook</item>
<item>@raw/thumb_facebook</item>
<item>@raw/favicon_wikipedia</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e79ea58..75762a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -811,15 +811,15 @@
<item>Google</item>
<item>http://www.google.com/</item>
<item>Picasa</item>
- <item>http://picasaweb.google.com/m/viewer?source=androidclient</item>
+ <item>http://picasaweb.google.com/</item>
<item>Yahoo!</item>
<item>http://www.yahoo.com/</item>
<item>MSN</item>
<item>http://www.msn.com/</item>
- <item>MySpace</item>
- <item>http://www.myspace.com/</item>
+ <item>Twitter</item>
+ <item>http://twitter.com/</item>
<item>Facebook</item>
- <item>http://www.facebook.com/</item>
+ <item>http://www.facebook.com/?m2w</item>
<item>Wikipedia</item>
<item>http://www.wikipedia.org/</item>
<item>eBay</item>
@@ -831,7 +831,7 @@
<item>ESPN</item>
<item>http://espn.com/</item>
<item>Amazon</item>
- <item>http://www.amazon.com/</item>
+ <item>http://www.amazon.com/?force-full-site=1</item>
<item>Weather Channel</item>
<item>http://www.weather.com/</item>
<item>BBC</item>
diff --git a/src/com/android/browser/GoogleAccountLogin.java b/src/com/android/browser/GoogleAccountLogin.java
index 855c407..910c1bc 100644
--- a/src/com/android/browser/GoogleAccountLogin.java
+++ b/src/com/android/browser/GoogleAccountLogin.java
@@ -35,6 +35,7 @@
import android.net.http.AndroidHttpClient;
import android.net.Uri;
import android.os.Bundle;
+import android.util.Log;
import android.webkit.CookieManager;
import android.webkit.WebView;
import android.webkit.WebViewClient;
@@ -44,14 +45,16 @@
public class GoogleAccountLogin extends Thread implements
AccountManagerCallback<Bundle>, OnCancelListener {
+ private static final String LOGTAG = "BrowserLogin";
+
// Url for issuing the uber token.
private Uri ISSUE_AUTH_TOKEN_URL = Uri.parse(
"https://www.google.com/accounts/IssueAuthToken?service=gaia&Session=false");
// Url for signing into a particular service.
- private final static Uri TOKEN_AUTH_URL = Uri.parse(
+ private static final Uri TOKEN_AUTH_URL = Uri.parse(
"https://www.google.com/accounts/TokenAuth");
// Google account type
- private final static String GOOGLE = "com.google";
+ private static final String GOOGLE = "com.google";
private final Activity mActivity;
private final Account mAccount;
@@ -103,16 +106,21 @@
try {
HttpResponse response = client.execute(request);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+ Log.d(LOGTAG, "LOGIN_FAIL: Bad status from auth url "
+ + response.getStatusLine().getStatusCode() + ": "
+ + response.getStatusLine().getReasonPhrase());
done();
return;
}
HttpEntity entity = response.getEntity();
if (entity == null) {
+ Log.d(LOGTAG, "LOGIN_FAIL: Null entity in response");
done();
return;
}
result = EntityUtils.toString(entity, "UTF-8");
} catch (Exception e) {
+ Log.d(LOGTAG, "LOGIN_FAIL: Exception acquiring uber token " + e);
request.abort();
done();
return;
@@ -163,6 +171,7 @@
break;
}
} catch (Exception e) {
+ Log.d(LOGTAG, "LOGIN_FAIL: Exception in state " + mState + " " + e);
// For all exceptions load the original signin page.
// TODO: toast login failed?
done();
@@ -219,6 +228,7 @@
// This can happen on success, error, or timeout.
private synchronized void done() {
if (mRunnable != null) {
+ Log.d(LOGTAG, "Finished login attempt for " + mAccount.name);
mActivity.runOnUiThread(mRunnable);
mRunnable = null;
mWebView.destroy();
