commit 46473c5f8f772d3cb869d712c596308ba10722d3
author John Reck <jreck@google.com> Mon Jun 27 09:25:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 27 09:25:15 2011 -0700
tree 5ec88a5c34a9e7e1e58f540626660194d3bb993d
parent bcba77a5bb4ec468bb6dc8aa298e5093d2d7121f
parent 38def32cdfcbe03924d7991f901f8e6a9fe229d5

Merge "Tweak title bar animation"

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index ad45958..bcb18f1 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -872,7 +872,7 @@
             } else if (visibleTitleHeight == getTitleBar().getEmbeddedHeight()
                     && mHandler.hasMessages(MSG_HIDE_TITLEBAR)) {
                 mHandler.removeMessages(MSG_HIDE_TITLEBAR);
-                hideTitleBar();
+                suggestHideTitleBar();
             }
         } else if (scrollY > mLastScrollY) {
             mLastScrollY = scrollY;

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index bc5868f..c78b562 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -799,6 +799,22 @@
                 handler.ignore();
                 return;
             }
+            int colon = host_and_port.lastIndexOf(':');
+            String host;
+            int port;
+            if (colon == -1) {
+                host = host_and_port;
+                port = -1;
+            } else {
+                String portString = host_and_port.substring(colon + 1);
+                try {
+                    port = Integer.parseInt(portString);
+                    host = host_and_port.substring(0, colon);
+                } catch  (NumberFormatException e) {
+                    host = host_and_port;
+                    port = -1;
+                }
+            }
             KeyChain.choosePrivateKeyAlias(mActivity, new KeyChainAliasCallback() {
                 @Override public void alias(String alias) {
                     if (alias == null) {
@@ -807,7 +823,7 @@
                     }
                     new KeyChainLookup(mActivity, handler, alias).execute();
                 }
-            }, null, null, null, -1);
+            }, null, null, host, port, null);
         }
 
         /**