From e4395e4c0786da8ce5c00cb2762e78ad706e86db Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Sat, 22 Oct 2016 17:28:58 -0700
Subject: [PATCH] Partial Find on Page implimentation.

---
 app/build.gradle                              |   2 +-
 app/src/main/assets/de/about_licenses.html    |   7 ++
 app/src/main/assets/en/about_licenses.html    |   7 ++
 app/src/main/assets/en/images/ic_close.png    | Bin 0 -> 799 bytes
 .../main/assets/en/images/ic_expand_less.png  | Bin 0 -> 604 bytes
 .../main/assets/en/images/ic_expand_more.png  | Bin 0 -> 586 bytes
 .../privacybrowser/MainWebViewActivity.java   |  17 +++--
 app/src/main/res/drawable/close.xml           |  15 ++++
 app/src/main/res/drawable/next.xml            |  15 ++++
 app/src/main/res/drawable/previous.xml        |  15 ++++
 .../main/res/layout/find_on_page_app_bar.xml  |  64 ++++++++++++++++++
 .../layout/{url_bar.xml => url_app_bar.xml}   |  32 ++++-----
 .../main/res/menu/webview_options_menu.xml    |  14 ++--
 app/src/main/res/values/strings.xml           |   5 ++
 build.gradle                                  |   2 +-
 15 files changed, 167 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/assets/en/images/ic_close.png
 create mode 100644 app/src/main/assets/en/images/ic_expand_less.png
 create mode 100644 app/src/main/assets/en/images/ic_expand_more.png
 create mode 100644 app/src/main/res/drawable/close.xml
 create mode 100644 app/src/main/res/drawable/next.xml
 create mode 100644 app/src/main/res/drawable/previous.xml
 create mode 100644 app/src/main/res/layout/find_on_page_app_bar.xml
 rename app/src/main/res/layout/{url_bar.xml => url_app_bar.xml} (65%)

diff --git a/app/build.gradle b/app/build.gradle
index 3f2a08d4..823eb5e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,5 +60,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:design:24.2.1'
     // Only compile `com.google.android.gms:play-services-ads` for the free flavor.
-    freeCompile 'com.google.android.gms:play-services-ads:9.6.1'
+    freeCompile 'com.google.android.gms:play-services-ads:9.8.00'
 }
diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html
index 83ee46c0..a4aa2f0c 100644
--- a/app/src/main/assets/de/about_licenses.html
+++ b/app/src/main/assets/de/about_licenses.html
@@ -105,6 +105,13 @@
 <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
 
 <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
+
+<p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
+
+<p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
+
+<p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
+
 <hr/>
 
 <h3>GNU General Public License</h3>
diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html
index 9c46415e..3ee97602 100644
--- a/app/src/main/assets/en/about_licenses.html
+++ b/app/src/main/assets/en/about_licenses.html
@@ -103,11 +103,18 @@
 
 <p><img class="icon" src="images/ic_web.png"> ic_web.</p>
 
+<p><img class="icon" src="images/ic_expand_less.png"> ic_expand_less.</p>
+
+<p><img class="icon" src="images/ic_expand_more.png"> ic_expand_more.</p>
+
+<p><img class="icon" src="images/ic_close.png"> ic_close.</p>
+
 <br/>
 
 <p><img class="left" src="images/cookie.png"> cookie was created by Google.
     It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
     and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>.</p>
+
 <hr/>
 
 <h3>GNU General Public License</h3>
diff --git a/app/src/main/assets/en/images/ic_close.png b/app/src/main/assets/en/images/ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f1086a5502f1d2c7e0f64beba5116ffe7c658d4
GIT binary patch
literal 799
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l&GB?`
z45^s&_O5r{Z3h9@i{jR^C#W;c=~Z8x5^6Z1_XzXOhBk(#l+E^`SHCmN>+;>J&6^`R
z31~VxSa5CilG|^bc}gxnp11J0@JH`U_MY}?^HW=PFX8vBSE-#}Gwo&0pa1dpH<dSh
zd|NlY??L6CH-a|(`%74&AE);wWdBiBz9DTN%~JhXU-aO`kDFZzO8%%SSy<P7;W*bf
z->%8r_L$A@mI#*jkNacZ#$JE-HTTcN<2$^6t^TF1cF5ZCt+xFo+qg-VOvmgsl39A{
zgO+hf><?<=kodpogrGs4vY>LppJPg{2Y$?T>1g<9{aJ?bG5;e&repGFf?0a(JKH%V
z>Nm|4G}tF>tdvlb?&fyjhhHyH;oR4fjE~tbDl;A9UzW<!BOlVuAz{B`_51^|PbZ&R
z8C$9TVCwuMD>x+XZ@dSzg<-E!!XJky_X9r|w{|srWZo_1`0HbQntVb-{$~CL%Xh2(
z^WG17&m_53YCZ>3maUy2%cblZC5{E(f4DrjvEpOr0mXkZdp2mV|MQ7iar6J5ETU08
z@pfWBRYiY38Fnf($UUCk@5|EnRc8MlHbD!Mq(7gcTppY_@$q!FP$RSPG5z(vEW&4H
z_S-NE`aDSd^GV0WV8Zf`r;P;<GRPg*KkvpOTPe5SMp>{#04TY}<wC%ckGz5=LWMQX
zEaI+m_XQl6@;sJSve3Nzqm6^_l*K;9CfS+C&0RJ$uJ5z0Td%p_>YM8&|Fxf2t*BN1
zv35zkobKFyg;zhG<*=+gZtkw!VYkmx>Y&i$*?T!Q_2hq3ipZ+jEb6%J<JmA4@4ozb
z$|tP$RrV#k{MhR{p|&O&7+McQFXetyWZU(!@H~2I0`dbM3a_~uSuSP3Uk#G=boFyt
I=akR{0PLVifdBvi

literal 0
HcmV?d00001

diff --git a/app/src/main/assets/en/images/ic_expand_less.png b/app/src/main/assets/en/images/ic_expand_less.png
new file mode 100644
index 0000000000000000000000000000000000000000..1140aa2dcd601ea66bf855e5f1d5cfe2a5a7160a
GIT binary patch
literal 604
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l-t=^F
z45^s&_NH}SaG*r%#k-dxl5{dPoF;IzFwMw!6Od|i>}^p{T)ALFzr!@c@3rqXUY``B
z_HX@uS#wXI9he~N_M5ml3w<Z~d)ld2#{Co%3w!kc*4~~6J#UViHyM9g|HG|-?VtF4
z4!?-&KxWggW9Ci5Mkf0N=QM2m*t;Mx_^5dko3HGB4k@GX8s&@wcRuze9G%vc&!WA>
zvuJvvqI~&!Mf+;;|6c3z&cy!<p49JoPxYtehw>k4D>Ax%v<jM}odS_beLs%+_9R?=
z))Oyr(5tue|BNTj{oi+aelqy5w<m$k`<Q-Df@;<g{hkGzHh#SCUvT)ggrjJ72T<{$
zYa;s%np%50|4+zWv2%~tr{o8@ZWj*T_>nKR<D-_FLATf=aW{jF(;kV3d+y`kah>Da
z773sR&O2#0*em8g*>z~|?{%B^rk*gq6SkwgRBuv^@9dA=(_jAg{h)iYTk80_!1;n}
zbn7mrvpkZ&kjj$X8($*X_`_XB`e5y(>tFp|zq!G2<o$yS98sO|GE$8{Z2#CcU3(-x
z{iiY0NA?{apHy>?>FaH-W&6lp752M<bIu`S%oqTP7_{I2w;>?@LD@?s5ZBYy&t;uc
GLK6VQ68#nc

literal 0
HcmV?d00001

diff --git a/app/src/main/assets/en/images/ic_expand_more.png b/app/src/main/assets/en/images/ic_expand_more.png
new file mode 100644
index 0000000000000000000000000000000000000000..897b3061822d9291d4366b9ec6afbe4fe8806737
GIT binary patch
literal 586
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l9`|%{
z45^s&_Ui6D;XsMji+7b&_WO73P!O1~!zMpUDy~(^Q6XfBgihqd$7lY|F^=<|b?g6+
z+l4|v^Ra-6W2-N*pGn|;A8;ge(tFQ)Q|wZjUYESzpkM2ey>8MUk5Bq1Yj4RMES)s}
z<-LdDJqxx!{?Y#2?xgR@#cWo6^%Xq}+JiqvOCMbM!|lT1oj=z0Jcy}Lwpi@{=ds`(
z-Qs7FzxT-8=kSvd`v2jNU#zl((0z`1J5F!VU$?EE-TY;q<Y&He)^}^qy;g}ge#foz
z*L#Ei_vtpzzU6zCy`CSlT+ChJ-<c?>#vj}>jhfn3<imG-jNNsxbN_@{KnbrbnZ_U5
zv#px^jqepnf9zh7$nr=$tcc}Nc+x43e`$9(@+SY0{5kWHe!?pbJN_R!AGNn0<GAPk
zXO*rc(?{uzM>vk;pP8d9us<-^{e$Ys_Ky2oVs{B7Gui#AKaziEN<7m?^Q5(c9q}8N
zx+~N%PXjuFcV;!qBlC=Pf*toatW*}LXFk^F@P}8@3aE0$dyXUbH%xa^_{Un2$MPtC
p!g6JS|4gzV{%zM9ETPV@V28V3mEZ3}g3DAu(w?q<F6*2UngGN&@1p<!

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
index a27dddb2..7872677d 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/MainWebViewActivity.java
@@ -81,7 +81,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         SslCertificateError.SslCertificateErrorListener, DownloadFile.DownloadFileListener {
 
     // `appBar` is public static so it can be accessed from `OrbotProxyHelper`.
-    // It is also used in `onCreate()`.
+    // It is also used in `onCreate()` and `onOptionsItemSelected()`.
     public static ActionBar appBar;
 
     // `favoriteIcon` is public static so it can be accessed from `CreateHomeScreenShortcut`, `BookmarksActivity`, `CreateBookmark`, `CreateBookmarkFolder`, and `EditBookmark`.
@@ -154,6 +154,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
     // `sslErrorHandler` is used in `onCreate()`, `onSslErrorCancel()`, and `onSslErrorProceed`.
     private SslErrorHandler sslErrorHandler;
 
+    private MenuItem toggleJavaScript;
+
     @Override
     // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled.  The whole premise of Privacy Browser is built around an understanding of these dangers.
     @SuppressLint("SetJavaScriptEnabled")
@@ -169,8 +171,8 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         // This is needed to get rid of the Android Studio warning that appBar might be null.
         assert appBar != null;
 
-        // Add the custom url_bar layout, which shows the favoriteIcon, urlTextBar, and progressBar.
-        appBar.setCustomView(R.layout.url_bar);
+        // Add the custom url_app_bar layout, which shows the favoriteIcon, urlTextBar, and progressBar.
+        appBar.setCustomView(R.layout.url_app_bar);
         appBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
 
         // Set the "go" button on the keyboard to load the URL in urlTextBox.
@@ -441,6 +443,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         updatePrivacyIcons();
 
         // Get handles for the menu items.
+        toggleJavaScript = menu.findItem(R.id.toggleJavaScript);
         MenuItem toggleFirstPartyCookies = menu.findItem(R.id.toggleFirstPartyCookies);
         MenuItem toggleThirdPartyCookies = menu.findItem(R.id.toggleThirdPartyCookies);
         MenuItem toggleDomStorage = menu.findItem(R.id.toggleDomStorage);
@@ -732,6 +735,12 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
                 mainWebView.getSettings().setTextZoom(200);
                 return true;
 
+            case R.id.find_on_page:
+                appBar.setCustomView(R.layout.find_on_page_app_bar);
+                toggleJavaScript.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+                appBar.invalidateOptionsMenu();
+                return true;
+
             case R.id.share:
                 Intent shareIntent = new Intent();
                 shareIntent.setAction(Intent.ACTION_SEND);
@@ -896,7 +905,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation
         adView = findViewById(R.id.adView);
 
         // `invalidateOptionsMenu` should recalculate the number of action buttons from the menu to display on the app bar, but it doesn't because of the this bug:  https://code.google.com/p/android/issues/detail?id=20493#c8
-        invalidateOptionsMenu();
+        // invalidateOptionsMenu();
     }
 
     @Override
diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml
new file mode 100644
index 00000000..003e13bc
--- /dev/null
+++ b/app/src/main/res/drawable/close.xml
@@ -0,0 +1,15 @@
+<!-- close.xml comes from the Android Material icon set, where it is called ic_close.
+    It is released under the Apache License 2.0. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml
new file mode 100644
index 00000000..0ed52fca
--- /dev/null
+++ b/app/src/main/res/drawable/next.xml
@@ -0,0 +1,15 @@
+<!-- next.xml comes from the Android Material icon set, where it is called ic_expand_more.
+    It is released under the Apache License 2.0. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml
new file mode 100644
index 00000000..9908d7f4
--- /dev/null
+++ b/app/src/main/res/drawable/previous.xml
@@ -0,0 +1,15 @@
+<!-- previous.xml comes from the Android Material icon set, where it is called ic_expand_less.
+    It is released under the Apache License 2.0. -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+</vector>
diff --git a/app/src/main/res/layout/find_on_page_app_bar.xml b/app/src/main/res/layout/find_on_page_app_bar.xml
new file mode 100644
index 00000000..3cb0f995
--- /dev/null
+++ b/app/src/main/res/layout/find_on_page_app_bar.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/find_on_page_relativelayout"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+
+    <ImageView
+        android:id="@+id/close_find"
+        android:src="@drawable/close"
+        android:layout_alignParentEnd="true"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_centerVertical="true"
+        android:contentDescription="@string/close" />
+
+    <ImageView
+        android:id="@+id/find_next"
+        android:src="@drawable/next"
+        android:layout_toStartOf="@id/close_find"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_centerVertical="true"
+        android:contentDescription="@string/next" />
+
+    <ImageView
+        android:id="@+id/find_previous"
+        android:src="@drawable/previous"
+        android:layout_toStartOf="@id/find_next"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_centerVertical="true"
+        android:contentDescription="@string/previous" />
+
+    <!-- `android:imeOptions="actionGo"` sets the keyboard to have a `go` key instead of a `new line` key. -->
+    <EditText
+        android:id="@+id/find_on_page_edittext"
+        android:layout_toStartOf="@id/find_previous"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:hint="@string/find_on_page"
+        android:imeOptions="actionGo" />
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/url_bar.xml b/app/src/main/res/layout/url_app_bar.xml
similarity index 65%
rename from app/src/main/res/layout/url_bar.xml
rename to app/src/main/res/layout/url_app_bar.xml
index afe8651c..b2c7fb57 100644
--- a/app/src/main/res/layout/url_bar.xml
+++ b/app/src/main/res/layout/url_app_bar.xml
@@ -18,22 +18,20 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- FrameLayout lets the ProgressBar float on top of `urlTextBox`. -->
+<!-- `FrameLayout` lets the `ProgressBar` float on top of `urlTextBox`. -->
 <FrameLayout
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/addressBarFrameLayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
 
-    <!-- RelativeLayout is used instead of a LinearLayout because supportAppBar does not let android:layout_weight="1" to cause urlTextBox to fill all the available space. -->
+    <!-- `RelativeLayout` is used instead of a `LinearLayout` because `supportAppBar` does not let `android:layout_weight="1"` cause `urlTextBox` to fill all the available space. -->
     <RelativeLayout
-        android:id="@+id/addressBarRelativeLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent" >
 
-        <!-- Set the program icon as the initial favoriteIcon.
-            `layout_height` and `layout_width` and of 26dp matches the AppBar icons. -->
+        <!-- Set the program icon as the initial `favoriteIcon`.
+            `layout_height` and `layout_width` of 26dp matches the `AppBar` icons. -->
         <ImageView
             android:id="@+id/favoriteIcon"
             android:src="@drawable/world"
@@ -43,23 +41,21 @@
             android:onClick="viewSslCertificate"
             android:contentDescription="@string/favorite_icon" />
 
-        <!-- `android:imeOptions="actionGo"` sets the keyboard to have a "go" key instead of a "new line" key.
-            `android:inputType="textUri"` disables spell check in the EditText.
-            We can't use `android:imeOptions=flagNoExtractUi"` because it disables tapping to select in landscape orientation on small devices. -->
+        <!-- `android:imeOptions="actionGo"` sets the keyboard to have a `go` key instead of a `new line` key.
+            `android:inputType="textUri"` disables spell check in the `EditText`. -->
         <EditText
             android:id="@+id/urlTextBox"
-            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_width="match_parent"
             android:layout_toEndOf="@id/favoriteIcon"
             android:hint="@string/url_or_search_terms"
             android:imeOptions="actionGo"
             android:inputType="textUri" />
     </RelativeLayout>
 
-    <!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage.
-        android:layout_height="2dp" works best for API 23 "Marshmallow", but "3dp" is required for visibility on API <= 22.
-        `tools:ignore="UnusedAttribute"` removes the lint waring about `progressTint` and `progressBackgroundTint`
-        not applying to API < 21.-->
+    <!-- `android:max` changes the maximum `ProgressBar` value from 10000 to 100 to match progress percentage.
+        `android:layout_height="2dp"` works best for API 23 Marshmallow, but `3dp` is required for visibility on API <= 22.
+        `tools:ignore="UnusedAttribute"` removes the lint waring about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleHorizontal"
diff --git a/app/src/main/res/menu/webview_options_menu.xml b/app/src/main/res/menu/webview_options_menu.xml
index 89f1bfbd..8dee5b1d 100644
--- a/app/src/main/res/menu/webview_options_menu.xml
+++ b/app/src/main/res/menu/webview_options_menu.xml
@@ -129,27 +129,33 @@
         </menu>
     </item>
 
+    <item
+        android:id="@+id/find_on_page"
+        android:title="@string/find_on_page"
+        android:orderInCategory="100"
+        app:showAsAction="never|collapseActionView" />
+
     <item
         android:id="@+id/share"
         android:title="@string/share"
-        android:orderInCategory="100"
+        android:orderInCategory="110"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/addToHomescreen"
         android:title="@string/add_to_home_screen"
-        android:orderInCategory="110"
+        android:orderInCategory="120"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/print"
         android:title="@string/print"
-        android:orderInCategory="120"
+        android:orderInCategory="130"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/refresh"
         android:title="@string/refresh"
-        android:orderInCategory="120"
+        android:orderInCategory="140"
         app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 57c2c0a0..1a540fce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,12 +112,17 @@
         <string name="one_hundred_fifty_percent">150%</string>
         <string name="one_hundred_seventy_five_percent">175%</string>
         <string name="two_hundred_percent">200%</string>
+    <string name="find_on_page">Find on Page</string>
     <string name="share">Share</string>
     <string name="add_to_home_screen">Add to Home Screen</string>
     <string name="print">Print</string>
         <string name="privacy_browser_web_page">Privacy Browser Web Page</string>
     <string name="refresh">Refresh</string>
 
+    <!-- Find on Page. -->
+    <string name="previous">Previous</string>
+    <string name="next">Next</string>
+
     <!-- Create Home Screen Shortcut Alert Dialog. -->
     <string name="create_shortcut">Create shortcut</string>
     <string name="shortcut_name">Shortcut name</string>
diff --git a/build.gradle b/build.gradle
index 573f4fd6..ef7ae5ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-- 
2.43.0