commit 51b83ee47643f2634b1e7e2651943b96e57c3a69
author John Reck <jreck@google.com> Tue Nov 30 11:31:42 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 30 11:31:42 2010 -0800
tree 0c043a491bd47d2bacaf7f92e0e46ec6c8dc6dcb
parent 03c45af1100538291d1aad48473e6dddb9153807
parent 7c11d28643f571669b59ef0d700392c45256ce97

Merge "Fix strict violation"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aa7aa72..6327bf0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -160,8 +160,7 @@
                   android:configChanges="orientation|keyboardHidden">
         </activity>
 
-        <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences"
-                  android:configChanges="orientation|keyboardHidden">
+        <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences">
         </activity>
 
         <activity android:name="BrowserHistoryPage" android:label=""

res/layout/autofill_settings_fragment.xml

diff --git a/res/layout/autofill_settings_fragment.xml b/res/layout/autofill_settings_fragment.xml
index bdffebb..b0e0f53 100644
--- a/res/layout/autofill_settings_fragment.xml
+++ b/res/layout/autofill_settings_fragment.xml
@@ -38,6 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:shrinkColumns="1"
         android:stretchColumns="1">
         <TableRow
             android:layout_height="match_parent"

res/layout/browser_add_bookmark.xml

diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index 0eaf526..c547389 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -69,6 +69,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:stretchColumns="1"
+        android:shrinkColumns="1"
         android:paddingTop="20dip"
         android:paddingLeft="20dip"
         android:paddingRight="20dip" >

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index a048c2d..3647a20 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -497,8 +497,10 @@
 
         @Override
         public void onPageFinished(WebView view, String url) {
-            LogTag.logPageFinishedLoading(
-                    url, SystemClock.uptimeMillis() - mLoadStartTime);
+            if (!isPrivateBrowsingEnabled()) {
+                LogTag.logPageFinishedLoading(
+                        url, SystemClock.uptimeMillis() - mLoadStartTime);
+            }
             mInPageLoad = false;
 
             mWebViewController.onPageFinished(Tab.this, url);

src/com/android/browser/UrlInputView.java

diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 2e29f26..9c85616 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -20,6 +20,7 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.ActionMode;
 import android.view.KeyEvent;
@@ -148,7 +149,7 @@
         this.dismissDropDown();
         this.setSelection(0,0);
         mInputManager.hideSoftInputFromWindow(getWindowToken(), 0);
-        if (url == null) {
+        if (TextUtils.isEmpty(url)) {
             mListener.onDismiss();
         } else {
             mListener.onAction(url, extra);