From d9e888e8a9485b5083fe6e76293e483d2ac942a3 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Thu, 2 Apr 2015 21:50:59 -0400
Subject: [PATCH] Change Navigation Drawer layout slightly, fix dark theme for
 drawer

---
 AndroidManifest.xml                           |   4 +-
 res/drawable-hdpi/ic_action_tabs_dark.png     | Bin 0 -> 165 bytes
 res/drawable-hdpi/ic_action_tabs_light.png    | Bin 0 -> 178 bytes
 res/drawable-xhdpi/ic_action_tabs_dark.png    | Bin 0 -> 177 bytes
 res/drawable-xhdpi/ic_action_tabs_light.png   | Bin 0 -> 193 bytes
 res/drawable-xxhdpi/ic_action_tabs_dark.png   | Bin 0 -> 235 bytes
 res/drawable-xxhdpi/ic_action_tabs_light.png  | Bin 0 -> 252 bytes
 res/drawable/list_bg_dark.xml                 |   7 ++
 res/drawable/list_bg_light.xml                |   7 ++
 res/layout/bookmark_drawer.xml                |  18 +--
 res/layout/bookmark_list_item.xml             |   5 +-
 res/layout/tab_drawer.xml                     |  47 +++++---
 res/layout/tab_list_item.xml                  |  13 ++-
 res/values-v21/styles.xml                     |   4 +
 res/values/attr.xml                           |   2 +
 res/values/colors.xml                         |   4 +
 res/values/strings.xml                        |   1 +
 res/values/styles.xml                         |   4 +
 .../browser/lightning/BrowserActivity.java    | 104 +++++++-----------
 19 files changed, 122 insertions(+), 98 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_action_tabs_dark.png
 create mode 100644 res/drawable-hdpi/ic_action_tabs_light.png
 create mode 100644 res/drawable-xhdpi/ic_action_tabs_dark.png
 create mode 100644 res/drawable-xhdpi/ic_action_tabs_light.png
 create mode 100644 res/drawable-xxhdpi/ic_action_tabs_dark.png
 create mode 100644 res/drawable-xxhdpi/ic_action_tabs_light.png
 create mode 100644 res/drawable/list_bg_dark.xml
 create mode 100644 res/drawable/list_bg_light.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d1176a..95e30d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,8 +3,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="acr.browser.lightning"
-    android:versionCode="72"
-    android:versionName="4.0.4a" >
+    android:versionCode="74"
+    android:versionName="4.0.6a" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
diff --git a/res/drawable-hdpi/ic_action_tabs_dark.png b/res/drawable-hdpi/ic_action_tabs_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..a894d9ccc8f7b8005ae1dd04e1ac10c34e3d369f
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt98VX=kcwMxZye-pP!Mo+e6@(f
zdlAdID+z*O3H~Q8PFCN1a?;Ev;vbS6k~J9^YGxI0+iG0#_I$&}GWL890fh(q8}^m4
zuHXGX-haV5*@LUkH83zTed9b)+xzZ=(&@jN4+XddCfF-{&lhEA@U`U$n7BpmZ^>Ms
Oy$qhNelF{r5}E)2$UVjY

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_action_tabs_light.png b/res/drawable-hdpi/ic_action_tabs_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a3ebfde24b4c81f7757c648f7451accd8fcfc4d
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtN>3NZkcwMxZz%FL81Oh;yvu%Z
z+1y7)6)NHn*ede4MI)|UT5`JHv-I;(F}G}>`X5i<&7L`Trm(d;o6O$t*2PKcj4T2M
zdI|OUZQ4N2_y6uLVxh6d>SaZ2910B$o=m6W7aQATWYv2WbZ{yxsB?IGUkhl=<SK^$
XY9BXG*?*!1$Ybzy^>bP0l+XkKxpzIH

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_action_tabs_dark.png b/res/drawable-xhdpi/ic_action_tabs_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..20ce803330ccbfb4bc5bd33f6e6cf049f74102c8
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6`n4RAr-gY-rC69pdio|=(eC#
zLo9)>T;bg_zvolS!X|0o^Zv)WPojx)EhA8Qyi(G$b&F<OGp)H3TjI^Y$RgkXBz~A4
zI5F4NJSNn<hS9cMB(|K5L!p6z2~6zZe3XAd63(rV2b#k0;S<A3zWYvzUrw2UxSp<l
JF6*2Ung9$%HN5};

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_action_tabs_light.png b/res/drawable-xhdpi/ic_action_tabs_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc169db9cc465326f8b8134a379d3f0bee950b0d
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=9iA?ZAr-gY-rC69pdjE7$iAVN
zN6M+;&@I_H2P`Jv=9)WKl=Eoy$*VDSjs}I1Kn)G{OQ$G5uQ_i~yZs?!kXN|%o0)~b
z@|ZXj8W@1Y0Sm)pdu2<`S=5^QU%lwWk-fHbHc<K<10#!o1BB3btl{0o4Cnr52O7#y
Yvu7zw?GqKYmenAhr>mdKI;Vst0Q-_XZU6uP

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_action_tabs_dark.png b/res/drawable-xxhdpi/ic_action_tabs_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..66cbcea7d141c9b11614dcd2f14271ed2a03df2b
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGon><|{Ln>~)y~D`cpdio|Xmz2H
zr)2{h>lsgV8}Apn-|u}>|FJA*(@iO$S}=H0dT!>%-6ztHF=%h=&f!#OU|`}vCl1VK
ztjZCI{Qg&Z)83|g?w_?bJrpS8;6_&l(i&jVuzq2K^}|Kwhxig1Sp*yyFo+*|4gXmg
bVfMGM#|B7p2*l}{f<!!B{an^LB{Ts5(dj_f

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_action_tabs_light.png b/res/drawable-xxhdpi/ic_action_tabs_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..167f3484dc391810d5218bbfe7d007f99102e586
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGohdo^!Ln>~)y>ph6$xxu-;@SgT
zTNwEpPx2p>+Y>eCuGfb4y9f5L2Osz#%f$HvqyY>P;srnEtgSUVbE|YW!`5r%@BhwD
zyta;sL!p5IgD9A3`8>Dh;|YW8@bC9GObt3^s}v`h_V$%P83#8u^%G1RZU-EgU2xAl
nv3&!kaUd;oj?_ECoWf9V|FS}K{Vg>WZIF<stDnm{r-UW|<_%63

literal 0
HcmV?d00001

diff --git a/res/drawable/list_bg_dark.xml b/res/drawable/list_bg_dark.xml
new file mode 100644
index 0000000..7c0e9fd
--- /dev/null
+++ b/res/drawable/list_bg_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/selected_dark" android:state_pressed="true"/>
+    <item android:drawable="@color/selected_dark" android:state_activated="true"/>
+
+</selector>
\ No newline at end of file
diff --git a/res/drawable/list_bg_light.xml b/res/drawable/list_bg_light.xml
new file mode 100644
index 0000000..fe5207f
--- /dev/null
+++ b/res/drawable/list_bg_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/selected_light" android:state_pressed="true"/>
+    <item android:drawable="@color/selected_light" android:state_activated="true"/>
+
+</selector>
\ No newline at end of file
diff --git a/res/layout/bookmark_drawer.xml b/res/layout/bookmark_drawer.xml
index 9348d60..77f259c 100644
--- a/res/layout/bookmark_drawer.xml
+++ b/res/layout/bookmark_drawer.xml
@@ -13,35 +13,35 @@
         android:id="@+id/bookmark_title"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/listBackground"
-        android:clickable="true"
+        android:background="?attr/dividerColor"
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
         <ImageView
             android:id="@+id/starIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
             android:contentDescription="Favicon"
             android:gravity="center_vertical"
             android:src="?attr/starDrawable" >
         </ImageView>
 
         <TextView
-            android:id="@+id/text2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:layout_marginLeft="16dp"
             android:layout_toRightOf="@+id/starIcon"
+            android:fontFamily="sans-serif-light"
             android:gravity="center_vertical"
             android:maxLines="1"
-            android:minHeight="?android:attr/listPreferredItemHeightSmall"
+            android:minHeight="?android:attr/listPreferredItemHeight"
             android:text="@string/action_bookmarks"
-            android:textAppearance="?android:attr/textAppearanceListItemSmall" />
+            android:textAppearance="?android:attr/textAppearanceLarge" />
     </RelativeLayout>
 
     <View
diff --git a/res/layout/bookmark_list_item.xml b/res/layout/bookmark_list_item.xml
index 84f33d9..5b1af43 100644
--- a/res/layout/bookmark_list_item.xml
+++ b/res/layout/bookmark_list_item.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:background="@drawable/list_bg"
+    android:background="?attr/selectedBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal" >
 
@@ -20,12 +20,13 @@
         android:id="@+id/textBookmark"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif-light"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:paddingRight="16dp"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceListItemSmall" />
 
diff --git a/res/layout/tab_drawer.xml b/res/layout/tab_drawer.xml
index eb4b497..cacfe8c 100644
--- a/res/layout/tab_drawer.xml
+++ b/res/layout/tab_drawer.xml
@@ -10,37 +10,37 @@
     android:orientation="vertical" >
 
     <RelativeLayout
-        android:id="@+id/new_tab_button"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/listBackground"
+        android:background="?attr/dividerColor"
         android:gravity="center_vertical"
         android:orientation="horizontal" >
 
         <ImageView
             android:id="@+id/plusIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
             android:contentDescription="@string/action_new_tab"
             android:gravity="center_vertical"
-            android:src="?attr/plusDrawable" >
+            android:src="?attr/tabDrawable" >
         </ImageView>
 
         <TextView
-            android:id="@+id/text1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:layout_marginLeft="16dp"
             android:layout_toRightOf="@+id/plusIcon"
+            android:fontFamily="sans-serif-light"
             android:gravity="center_vertical"
             android:maxLines="1"
-            android:minHeight="?android:attr/listPreferredItemHeightSmall"
-            android:text="@string/action_new_tab"
-            android:textAppearance="?android:attr/textAppearanceListItemSmall" />
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:text="@string/tabs"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
     </RelativeLayout>
 
     <View
@@ -65,12 +65,12 @@
         android:background="?attr/dividerColor" />
 
     <LinearLayout
-        android:id="@+id/linearLayout1"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:background="?attr/dividerColor"
         android:baselineAligned="false"
         android:orientation="horizontal"
-        android:weightSum="2" >
+        android:weightSum="3" >
 
         <RelativeLayout
             android:id="@+id/action_back"
@@ -92,6 +92,27 @@
                 android:src="?attr/arrowBackDrawable" />
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/new_tab_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="?attr/listBackground"
+            android:clickable="true" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:contentDescription="@string/action_new_tab"
+                android:paddingBottom="4dp"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:paddingTop="4dp"
+                android:src="?attr/plusDrawable" >
+            </ImageView>
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/action_forward"
             android:layout_width="match_parent"
diff --git a/res/layout/tab_list_item.xml b/res/layout/tab_list_item.xml
index cb54e17..5a43f1f 100644
--- a/res/layout/tab_list_item.xml
+++ b/res/layout/tab_list_item.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="56dp"
-    android:background="@drawable/list_bg"
+    android:background="?attr/selectedBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal" >
 
@@ -23,6 +23,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_toLeftOf="@+id/deleteButton"
         android:layout_toRightOf="@+id/faviconTab"
         android:ellipsize="end"
@@ -35,16 +37,15 @@
 
     <ImageView
         android:id="@+id/deleteButton"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="13dp"
-        android:alpha="0.5"
+        android:layout_marginRight="4dp"
         android:background="?attr/actionBarItemBackground"
         android:contentDescription="Delete Tab"
         android:gravity="center_vertical"
-        android:padding="3dp"
+        android:padding="12dp"
         android:src="?attr/deleteDrawable" >
     </ImageView>
 
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 8f20406..a09af9e 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -57,6 +57,8 @@
         <item name="deleteDrawable">@drawable/ic_action_delete</item>
         <item name="starDrawable">@drawable/ic_action_star</item>
         <item name="dividerColor">@color/divider_light</item>
+        <item name="tabDrawable">@drawable/ic_action_tabs_light</item>
+        <item name="selectedBackground">@drawable/list_bg_light</item>
     </style>
 
     <style name="Theme.DarkTheme" parent="Theme.AppCompat">
@@ -83,6 +85,8 @@
         <item name="deleteDrawable">@drawable/ic_action_delete_dark</item>
         <item name="starDrawable">@drawable/ic_action_star_dark</item>
         <item name="dividerColor">@color/divider_dark</item>
+        <item name="tabDrawable">@drawable/ic_action_tabs_dark</item>
+        <item name="selectedBackground">@drawable/list_bg_dark</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/attr.xml b/res/values/attr.xml
index c575601..69fd678 100644
--- a/res/values/attr.xml
+++ b/res/values/attr.xml
@@ -16,7 +16,9 @@
     <attr name="plusDrawable" format="reference|color" />
     <attr name="deleteDrawable" format="reference|color" />
     <attr name="starDrawable" format="reference|color" />
+    <attr name="tabDrawable" format="reference|color" />
     <attr name="dividerColor" format="reference|color" />
+    <attr name="selectedBackground" format="reference|color" />
 
     <declare-styleable name="AnimatedProgressBar">
         <attr name="progressColor" format="color" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0a874bd..5358ddc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,4 +28,8 @@
     <color name="divider_dark">#1EFFFFFF</color>
     <color name="divider_light">#1E000000</color>
     
+    
+    <color name="selected_dark">#0FFFFFFF</color>
+    <color name="selected_light">#0F000000</color>
+    
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89c1746..bb367d8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -213,4 +213,5 @@
         <string name="invert_color">Invert color</string>
         <string name="dark_theme">Use Dark Theme</string>
         <string name="change_after_restart">The theme change will take effect after you restart the browser.</string>
+        <string name="tabs">Tabs</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a75ae83..2be4b6b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -56,7 +56,9 @@
         <item name="plusDrawable">@drawable/ic_action_plus</item>
         <item name="deleteDrawable">@drawable/ic_action_delete</item>
         <item name="starDrawable">@drawable/ic_action_star</item>
+        <item name="tabDrawable">@drawable/ic_action_tabs_light</item>
         <item name="dividerColor">@color/divider_light</item>
+        <item name="selectedBackground">@drawable/list_bg_light</item>
     </style>
 
     <style name="Theme.DarkTheme" parent="Theme.AppCompat">
@@ -82,7 +84,9 @@
         <item name="plusDrawable">@drawable/ic_action_plus_dark</item>
         <item name="deleteDrawable">@drawable/ic_action_delete_dark</item>
         <item name="starDrawable">@drawable/ic_action_star_dark</item>
+        <item name="tabDrawable">@drawable/ic_action_tabs_dark</item>
         <item name="dividerColor">@color/divider_dark</item>
+        <item name="selectedBackground">@drawable/list_bg_dark</item>
     </style>
 
     <style name="overFlowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java
index 216baae..4e3eb53 100644
--- a/src/acr/browser/lightning/BrowserActivity.java
+++ b/src/acr/browser/lightning/BrowserActivity.java
@@ -125,7 +125,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 	@SuppressWarnings("deprecation")
 	private synchronized void initialize() {
 		setContentView(R.layout.activity_main);
-
+		getWindow().setBackgroundDrawable(null);
 		mToolbar = (Toolbar) findViewById(R.id.toolbar);
 		setSupportActionBar(mToolbar);
 
@@ -147,7 +147,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 		}
 		mActivity = this;
 		mClickHandler = new ClickHandler(this);
-		getWindow().setBackgroundDrawable(null);
 		mBrowserFrame = (FrameLayout) findViewById(R.id.content_frame);
 		mToolbarLayout = (LinearLayout) findViewById(R.id.toolbar_layout);
 		mPageLayout = (LinearLayout) findViewById(R.id.main_layout);
@@ -896,7 +895,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 		@Override
 		public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 			mIsNewIntent = false;
-			selectItem(position);
+			showTab(mWebViews.get(position));
 		}
 	}
 
@@ -1107,18 +1106,10 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 		// don't delete the tab because the browser will close and mess stuff up
 	}
 
-	private void selectItem(final int position) {
-		// update selected item and title, then close the drawer
-
-		showTab(mWebViews.get(position));
-
-	}
-
 	@SuppressWarnings("deprecation")
 	@Override
 	public void onTrimMemory(int level) {
-		if (level > TRIM_MEMORY_RUNNING_MODERATE
-				&& Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+		if (level > TRIM_MEMORY_MODERATE && Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
 			Log.d(Constants.TAG, "Low Memory, Free Memory");
 			for (LightningView view : mWebViews) {
 				view.getWebView().freeMemory();
@@ -1380,7 +1371,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 				}
 			}
 		}
-		
+
 		supportInvalidateOptionsMenu();
 	}
 
@@ -1553,8 +1544,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 
 						});
 
-						mToolbarLayout.setBackgroundColor(finalColor);
-						mPageLayout.setBackgroundColor(finalColor);
 						anim.setDuration(300);
 						anim.start();
 					}
@@ -1778,23 +1767,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 
 	@Override
 	public void updateProgress(int n) {
-		/*
-		 * if (n > mProgressBar.getProgress()) { ObjectAnimator animator =
-		 * ObjectAnimator.ofInt(mProgressBar, "progress", n);
-		 * animator.setDuration(200); animator.setInterpolator(new
-		 * DecelerateInterpolator()); animator.start(); } else if (n <
-		 * mProgressBar.getProgress()) { ObjectAnimator animator =
-		 * ObjectAnimator.ofInt(mProgressBar, "progress", 0, n);
-		 * animator.setDuration(200); animator.setInterpolator(new
-		 * DecelerateInterpolator()); animator.start(); } if (n >= 100) {
-		 * Handler handler = new Handler(); handler.postDelayed(new Runnable() {
-		 * 
-		 * @Override public void run() {
-		 * mProgressBar.setVisibility(View.INVISIBLE); setIsFinishedLoading(); }
-		 * }, 200);
-		 * 
-		 * } else { mProgressBar.setVisibility(View.VISIBLE); setIsLoading(); }
-		 */
 		if (n >= 100) {
 			setIsFinishedLoading();
 		} else {
@@ -2534,42 +2506,42 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
 	@Override
 	public void onClick(View v) {
 		switch (v.getId()) {
-		case R.id.action_back:
-			if (mCurrentView != null) {
-				if (mCurrentView.canGoBack()) {
-					mCurrentView.goBack();
-				} else {
-					deleteTab(mDrawerListLeft.getCheckedItemPosition());
+			case R.id.action_back:
+				if (mCurrentView != null) {
+					if (mCurrentView.canGoBack()) {
+						mCurrentView.goBack();
+					} else {
+						deleteTab(mDrawerListLeft.getCheckedItemPosition());
+					}
 				}
-			}
-			break;
-		case R.id.action_forward:
-			if (mCurrentView != null) {
-				if (mCurrentView.canGoForward()) {
-					mCurrentView.goForward();
+				break;
+			case R.id.action_forward:
+				if (mCurrentView != null) {
+					if (mCurrentView.canGoForward()) {
+						mCurrentView.goForward();
+					}
 				}
-			}
-			break;
-		case R.id.arrow_button:
-			if (mSearch != null && mSearch.hasFocus()) {
-				mCurrentView.requestFocus();
-			} else {
-				mDrawerLayout.openDrawer(mDrawerLeft);
-			}
-			break;
-		case R.id.new_tab_button:
-			newTab(null, true);
-			break;
-		case R.id.button_next:
-			mCurrentView.getWebView().findNext(false);
-			break;
-		case R.id.button_back:
-			mCurrentView.getWebView().findNext(true);
-			break;
-		case R.id.button_quit:
-			mCurrentView.getWebView().clearMatches();
-			mSearchBar.setVisibility(View.GONE);
-			break;
+				break;
+			case R.id.arrow_button:
+				if (mSearch != null && mSearch.hasFocus()) {
+					mCurrentView.requestFocus();
+				} else {
+					mDrawerLayout.openDrawer(mDrawerLeft);
+				}
+				break;
+			case R.id.new_tab_button:
+				newTab(null, true);
+				break;
+			case R.id.button_next:
+				mCurrentView.getWebView().findNext(false);
+				break;
+			case R.id.button_back:
+				mCurrentView.getWebView().findNext(true);
+				break;
+			case R.id.button_quit:
+				mCurrentView.getWebView().clearMatches();
+				mSearchBar.setVisibility(View.GONE);
+				break;
 		}
 	}
 }