Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Browser: Commit

packages/apps/Browser


Commit MetaInfo

Revisionb9f31c6bdc9fb20c88b8f6cf4a39f627fa228a83 (tree)
Time2011-05-28 05:43:23
AuthorJohn Reck <jreck@goog...>
CommiterAndroid (Google) Code Review

Log Message

Merge "DO NOT MERGE Fix vanishing title/url in window picker" into gingerbread

Change Summary

Incremental Difference

--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -43,6 +43,7 @@ import android.os.Message;
4343 import android.os.SystemClock;
4444 import android.provider.Browser;
4545 import android.speech.RecognizerResultsIntent;
46+import android.text.TextUtils;
4647 import android.util.Log;
4748 import android.view.KeyEvent;
4849 import android.view.LayoutInflater;
@@ -1862,8 +1863,8 @@ class Tab {
18621863 // Populate the picker data using the given history item and the current top
18631864 // WebView.
18641865 private void populatePickerData(WebHistoryItem item) {
1865- mPickerData = new PickerData();
1866- if (item != null) {
1866+ if (item != null && !TextUtils.isEmpty(item.getUrl())) {
1867+ mPickerData = new PickerData();
18671868 mPickerData.mUrl = item.getUrl();
18681869 mPickerData.mTitle = item.getTitle();
18691870 mPickerData.mFavicon = item.getFavicon();
@@ -1950,7 +1951,6 @@ class Tab {
19501951 // Restore the internal state even if the WebView fails to restore.
19511952 // This will maintain the app id, original url and close-on-exit values.
19521953 mSavedState = null;
1953- mPickerData = null;
19541954 mCloseOnExit = b.getBoolean(CLOSEONEXIT);
19551955 mAppId = b.getString(APPID);
19561956 mOriginalUrl = b.getString(ORIGINALURL);
Show on old repository browser