commit 3bec6a3b7fe6dd30e9dd2a2065ffca19ff6af542
author Vivek Sekhar <vsekhar@codeaurora.org> Wed Oct 22 17:03:42 2014 -0700
committer Vivek Sekhar <vsekhar@codeaurora.org> Thu Oct 23 11:14:07 2014 -0700
tree b9a75dba5245a4ee39ccc0d5163e9f93acd57a30
parent 46c3ec0fec8a2fc53619cead8dae5edbae2a6f3a

Remove quick controls

Change-Id: I0fa64f0fcd800db0c8d5c91dcbbcc265f4d8eb48

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 35e6ad3..d74e988 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -66,7 +66,6 @@
      */
     public PhoneUi(Activity browser, UiController controller) {
         super(browser, controller);
-        setUseQuickControls(BrowserSettings.getInstance().useQuickControls());
         mNavigationBar = (NavigationBarPhone) mTitleBar.getNavigationBar();
         mBrowser = browser;
     }
@@ -78,9 +77,6 @@
 
     @Override
     public void editUrl(boolean clearInput, boolean forceIME) {
-        if (mUseQuickControls) {
-            mTitleBar.setShowProgressOnly(false);
-        }
         //Do nothing while at Nav show screen.
         if (mShowNav) return;
         super.editUrl(clearInput, forceIME);
@@ -148,13 +144,8 @@
             return;
         }
         // Request focus on the top window.
-        if (mUseQuickControls) {
-            mPieControl.forceToTop(mContentView);
-            view.setTitleBar(null);
-            mTitleBar.setShowProgressOnly(true);
-        } else {
-            view.setTitleBar(mTitleBar);
-        }
+        view.setTitleBar(mTitleBar);
+
         // update nav bar state
         mNavigationBar.onStateChanged(StateListener.STATE_NORMAL);
         updateLockIconToLatest(tab);
@@ -184,12 +175,12 @@
             info.setVisible(false);
         }
         MenuItem newtab = menu.findItem(R.id.new_tab_menu_id);
-        if (newtab != null && !mUseQuickControls) {
+        if (newtab != null) {
             newtab.setVisible(false);
         }
         MenuItem incognito = menu.findItem(R.id.incognito_menu_id);
         if (incognito != null) {
-            incognito.setVisible(showingNavScreen() || mUseQuickControls);
+            incognito.setVisible(showingNavScreen());
         }
         MenuItem closeOthers = menu.findItem(R.id.close_other_tabs_id);
         if (closeOthers != null) {
@@ -244,9 +235,6 @@
     public void onActionModeFinished(boolean inLoad) {
         super.onActionModeFinished(inLoad);
         if (inLoad) {
-            if (mUseQuickControls) {
-                mTitleBar.setShowProgressOnly(true);
-            }
             showTitleBar();
         }
     }