Remove landscape-only option.
Bug:2416373
Change-Id: Icc32bf65bda016f18ebb5d02932446ff64b77427
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7d7fd0f..498723a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -331,10 +331,6 @@
<string name="pref_content_autofit">Auto-fit pages</string>
<!-- Settings summary -->
<string name="pref_content_autofit_summary">Format web pages to fit the screen</string>
- <!-- Settings label for enabling a mode where the browser is always set to landscape mode -->
- <string name="pref_content_landscape_only">Landscape-only display</string>
- <!-- Settings summary -->
- <string name="pref_content_landscape_only_summary">Display pages only in the wider, landscape screen orientation</string>
<!-- Settings screen & section title for "Personal settings". These include things like
configuring bookmark syncing to Google servers and form auto fill settings. [CHAR-LIMIT=32] -->
diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml
index cb4e0b5..623c8e7 100644
--- a/res/xml/browser_preferences.xml
+++ b/res/xml/browser_preferences.xml
@@ -68,12 +68,6 @@
android:summary="@string/pref_content_autofit_summary" />
<CheckBoxPreference
- android:key="landscape_only"
- android:defaultValue="false"
- android:title="@string/pref_content_landscape_only"
- android:summary="@string/pref_content_landscape_only_summary" />
-
- <CheckBoxPreference
android:key="enable_javascript"
android:defaultValue="true"
android:title="@string/pref_content_javascript" />
diff --git a/res/xml/page_content_preferences.xml b/res/xml/page_content_preferences.xml
index 84497dc..3d7791c 100644
--- a/res/xml/page_content_preferences.xml
+++ b/res/xml/page_content_preferences.xml
@@ -65,12 +65,6 @@
android:summary="@string/pref_content_autofit_summary" />
<CheckBoxPreference
- android:key="landscape_only"
- android:defaultValue="false"
- android:title="@string/pref_content_landscape_only"
- android:summary="@string/pref_content_landscape_only_summary" />
-
- <CheckBoxPreference
android:key="enable_javascript"
android:defaultValue="true"
android:title="@string/pref_content_javascript" />
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index db0f73e..99de9dc 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -88,7 +88,6 @@
private String homeUrl = "";
private SearchEngine searchEngine;
private boolean autoFitPage;
- private boolean landscapeOnly;
private boolean loadsPageInOverviewMode;
private boolean showDebugSettings;
// HTML5 API flags
@@ -412,11 +411,6 @@
autoFitPage = p.getBoolean("autofit_pages", autoFitPage);
loadsPageInOverviewMode = p.getBoolean("load_page",
loadsPageInOverviewMode);
- boolean landscapeOnlyTemp =
- p.getBoolean("landscape_only", landscapeOnly);
- if (landscapeOnlyTemp != landscapeOnly) {
- landscapeOnly = landscapeOnlyTemp;
- }
useWideViewPort = true; // use wide view port for either setting
if (autoFitPage) {
layoutAlgorithm = WebSettings.LayoutAlgorithm.NARROW_COLUMNS;
@@ -657,9 +651,6 @@
// Enable/disable the error console.
mTabControl.getBrowserActivity().setShouldShowErrorConsole(
showDebugSettings && showConsole);
- mTabControl.getBrowserActivity().setRequestedOrientation(
- landscapeOnly ? ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
- : ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}
/*package*/ void clearDatabases(Context context) {
@@ -715,7 +706,6 @@
autoFillEnabled = false;
openInBackground = false;
autoFitPage = true;
- landscapeOnly = false;
loadsPageInOverviewMode = true;
showDebugSettings = false;
// HTML5 API flags