Merge "Adding AppWidget xml flag to make widget resizable"
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();
}
/*
diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
index 835778a..e2e45f5 100644
--- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
@@ -16,9 +16,11 @@
package com.android.browser.preferences;
+import com.android.browser.BrowserActivity;
import com.android.browser.BrowserSettings;
import com.android.browser.R;
+import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.preference.ListPreference;
@@ -62,6 +64,9 @@
e = findPreference(BrowserSettings.PREF_DEFAULT_TEXT_ENCODING);
e.setOnPreferenceChangeListener(this);
+ e = findPreference(BrowserSettings.PREF_EXTRAS_RESET_DEFAULTS);
+ e.setOnPreferenceChangeListener(this);
+
e = findPreference(BrowserSettings.PREF_PLUGIN_STATE);
e.setOnPreferenceChangeListener(this);
updatePluginSummary((ListPreference) e);
@@ -121,7 +126,8 @@
} else if (pref.getKey().equals(BrowserSettings.PREF_EXTRAS_RESET_DEFAULTS)) {
Boolean value = (Boolean) objValue;
if (value.booleanValue() == true) {
- getActivity().finish();
+ startActivity(new Intent(BrowserActivity.ACTION_RESTART, null,
+ getActivity(), BrowserActivity.class));
return true;
}
} else if (pref.getKey().equals(BrowserSettings.PREF_PLUGIN_STATE)) {