Merge "Make enter advance navigation or sign in"
diff --git a/res/xml/bookmarkthumbnailwidget_info.xml b/res/xml/bookmarkthumbnailwidget_info.xml
index 6797f85..65497cd 100644
--- a/res/xml/bookmarkthumbnailwidget_info.xml
+++ b/res/xml/bookmarkthumbnailwidget_info.xml
@@ -21,5 +21,6 @@
android:minHeight="219dip"
android:updatePeriodMillis="0"
android:previewImage="@drawable/browser_widget_preview"
- android:initialLayout="@layout/bookmarkthumbnailwidget">
+ android:initialLayout="@layout/bookmarkthumbnailwidget"
+ android:resizeMode="vertical">
</appwidget-provider>
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index c1f1313..6e06e6e 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2372,19 +2372,9 @@
closeTab(current);
} else {
if (current.closeOnExit()) {
- // force the tab's inLoad() to be false as we are going to
- // either finish the activity or remove the tab. This will
- // ensure pauseWebViewTimers() taking action.
- current.clearInPageLoad();
- if (mTabControl.getTabCount() == 1) {
- mActivity.finish();
- return;
- }
- if (mActivityPaused) {
- Log.e(LOGTAG, "BrowserActivity is already paused "
- + "while handing goBackOnePageOrQuit.");
- }
- pauseWebViewTimers(current);
+ // This will finish the activity if there is only one tab
+ // open or it will switch to the next available tab if
+ // available.
closeCurrentTab();
}
/*