commit 66f8cef21dee091292fdf8aa346c829ff43ed26a
author Pankaj Garg <pgarg@codeaurora.org> Tue Jul 07 17:29:03 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:45 2015 +0200
tree 63d19529694099c2a235ccee1ecf2d3c31061448
parent 33551ffea822cb02d1ad88f5a33e046e98eca43f

NavigationBar code cleanup

- Unified code for phone and tablet UI
- Chagned Favicon to use Tiles
- Updates to Tile class

Change-Id: Iecb699a3e5eb848db149705a9142f8f199f02c04

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 254e73d..f4a3f5b 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -21,7 +21,6 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.PaintDrawable;
@@ -37,9 +36,6 @@
 import android.webkit.WebChromeClient;
 
 import org.codeaurora.swe.WebView;
-import org.codeaurora.swe.util.ColorUtils;
-
-import com.android.browser.R;
 
 import java.util.List;
 
@@ -82,7 +78,8 @@
 
     public void showComboView(ComboViews startWith, Bundle extras) {
         if (mComboView == null) {
-            ViewStub stub = (ViewStub) mActivity.getWindow().getDecorView().findViewById(R.id.combo_view_stub);
+            ViewStub stub = (ViewStub) mActivity.getWindow().getDecorView().
+                    findViewById(R.id.combo_view_stub);
             mComboView = (ComboView) stub.inflate();
             mComboView.setVisibility(View.GONE);
             mComboView.setupViews(mActivity);
@@ -102,7 +99,7 @@
 
     @Override
     public void hideComboView() {
-        if (showingComboView()) {
+        if (isComboViewShowing()) {
             mComboView.hideViews();
             mActionBar = mActivity.getActionBar();
             setupActionBar();
@@ -114,30 +111,22 @@
 
     @Override
     public boolean onBackKey() {
-        if (showingComboView()) {
+        if (isComboViewShowing()) {
             hideComboView();
             return true;
         }
         return super.onBackKey();
     }
 
-    private boolean showingComboView() {
-        return mComboView != null && mComboView.getVisibility() == View.VISIBLE;
-    }
-
     @Override
     public boolean isComboViewShowing() {
-        return showingComboView();
-    }
-
-    private void checkHideActionBar() {
+        return mComboView != null && mComboView.getVisibility() == View.VISIBLE;
     }
 
     @Override
     public void onResume() {
         super.onResume();
         mNavBar.clearCompletions();
-        checkHideActionBar();
     }
 
     @Override
@@ -185,10 +174,6 @@
         mTabBar.onNewTab(tab);
     }
 
-    protected void onAddTabCompleted(Tab tab) {
-        checkHideActionBar();
-    }
-
     @Override
     public void setActiveTab(final Tab tab) {
         mTitleBar.cancelTitleBarAnimation(true);
@@ -202,14 +187,11 @@
             return;
         }
         mTabBar.onSetActiveTab(tab);
-        updateLockIconToLatest(tab);
-        mTitleBar.setSkipTitleBarAnimations(false);
     }
 
     @Override
     public void updateTabs(List<Tab> tabs) {
         mTabBar.updateTabs(tabs);
-        checkHideActionBar();
     }
 
     @Override
@@ -229,10 +211,6 @@
             mActionBar.hide();
     }
 
-    protected void onRemoveTabCompleted(Tab tab) {
-        checkHideActionBar();
-    }
-
     int getContentWidth() {
         if (mContentView != null) {
             return mContentView.getWidth();
@@ -257,7 +235,6 @@
 
     @Override
     public void onActionModeFinished(boolean inLoad) {
-        checkHideActionBar();
         if (inLoad) {
             // the titlebar was removed when the CAB was shown
             // if the page is loading, show it again
@@ -295,7 +272,6 @@
     @Override
     public void onHideCustomView() {
         super.onHideCustomView();
-        checkHideActionBar();
         if (mActionBar != null)
             mActionBar.show();
     }
@@ -328,10 +304,6 @@
         return evt.getUnicodeChar() > 0;
     }
 
-    TabBar getTabBar() {
-        return mTabBar;
-    }
-
     @Override
     public boolean shouldCaptureThumbnails() {
         return false;
@@ -363,7 +335,8 @@
             d.setLayerInset(1, 2, 2, 2, 2);
             return d;
         }
-        return icon == null ? getGenericFavicon() : new BitmapDrawable(mActivity.getResources(), icon);
+        return icon == null ? getGenericFavicon() :
+                new BitmapDrawable(mActivity.getResources(), icon);
     }
 
 }