From f4edbdde11d0829ba8de78b2504d7e9abc5f7695 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Mon, 3 Oct 2016 23:45:46 +0530
Subject: [PATCH 01/15] Fix crash when try to extract text from un supported
 clip items. Fixes #2

---
 app/src/main/java/arun/com/chromer/util/Util.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/arun/com/chromer/util/Util.java b/app/src/main/java/arun/com/chromer/util/Util.java
index a6ab0986..0946ef46 100644
--- a/app/src/main/java/arun/com/chromer/util/Util.java
+++ b/app/src/main/java/arun/com/chromer/util/Util.java
@@ -43,6 +43,7 @@
 import arun.com.chromer.customtabs.prefetch.ScannerService;
 import arun.com.chromer.shared.Constants;
 import arun.com.chromer.views.IntentPickerSheetView;
+import timber.log.Timber;
 
 /**
  * Created by Arun on 17/12/2015.
@@ -307,11 +308,15 @@ public static boolean isNetworkAvailable(@NonNull Context context) {
     @Nullable
     public static String getClipBoardText(@NonNull Context context) {
         final ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-        if (clipboardManager.hasPrimaryClip()) {
-            final ClipData.Item item = clipboardManager.getPrimaryClip().getItemAt(0);
-            if (item != null) {
-                return item.getText().toString();
+        try {
+            if (clipboardManager.hasPrimaryClip() & clipboardManager.getPrimaryClip().getItemCount() != 0) {
+                final ClipData.Item item = clipboardManager.getPrimaryClip().getItemAt(0);
+                if (item != null && item.getText() != null) {
+                    return item.getText().toString();
+                }
             }
+        } catch (Exception ignored) {
+            Timber.e(ignored.toString());
         }
         return null;
     }

From d7b8f8b85119077eba8ee199fcf49a16e49e2c52 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 4 Oct 2016 00:10:16 +0530
Subject: [PATCH 02/15] Fix crash when attempting to create shorcut with a huge
 icon causing system to through too large transaction exception

---
 .../callbacks/AddHomeShortcutService.java     | 89 ++++++-------------
 1 file changed, 29 insertions(+), 60 deletions(-)

diff --git a/app/src/main/java/arun/com/chromer/customtabs/callbacks/AddHomeShortcutService.java b/app/src/main/java/arun/com/chromer/customtabs/callbacks/AddHomeShortcutService.java
index f23089c6..c53af4ef 100644
--- a/app/src/main/java/arun/com/chromer/customtabs/callbacks/AddHomeShortcutService.java
+++ b/app/src/main/java/arun/com/chromer/customtabs/callbacks/AddHomeShortcutService.java
@@ -20,7 +20,6 @@
 
 import com.bumptech.glide.Glide;
 
-import java.net.URL;
 import java.util.concurrent.ExecutionException;
 
 import arun.com.chromer.R;
@@ -57,38 +56,41 @@ protected void onHandleIntent(Intent intent) {
                     return;
                 }
 
-                String shortCutName = getShortcutName(unShortenedUrl, res);
-                String faviconUrl = res.getFaviconUrl();
+                final String shortCutName = getShortcutName(unShortenedUrl, res);
+                final String faviconUrl = res.getFaviconUrl();
                 Bitmap favicon = getFaviconBitmap(faviconUrl);
 
-                if (favicon != null) {
-                    if (!isValidFavicon(favicon)) {
-                        Palette palette = Palette.from(favicon).generate();
-                        int iconColor = ColorUtil.getBestFaviconColor(palette);
-                        if (iconColor == -1) {
-                            iconColor = ContextCompat.getColor(this, R.color.primary);
-                        }
-                        favicon = createIcon(iconColor, shortCutName);
-                    }
-                } else {
+                if (favicon == null) {
                     favicon = createIcon(ContextCompat.getColor(this, R.color.primary), shortCutName);
+                } else if (!isValidFavicon(favicon)) {
+                    final Palette palette = Palette.from(favicon).generate();
+                    int iconColor = ColorUtil.getBestFaviconColor(palette);
+                    if (iconColor == Constants.NO_COLOR) {
+                        iconColor = ContextCompat.getColor(this, R.color.primary);
+                    }
+                    favicon = createIcon(iconColor, shortCutName);
                 }
 
                 Timber.i("Creating shortcut: %s", shortCutName);
+                try {
+                    broadcastShortcutIntent(shortCutName, favicon, getWebIntent(unShortenedUrl));
+                } catch (Exception e) {
+                    Timber.e("Failed to create shortcut");
+                }
 
-                Intent webIntent = getWebIntent(unShortenedUrl);
-
-                Intent addIntent = new Intent(Constants.ACTION_INSTALL_SHORTCUT);
-                addIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, webIntent);
-                addIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, shortCutName);
-                addIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, favicon);
-
-                sendBroadcast(addIntent);
                 showToast(getString(R.string.added) + " " + shortCutName);
             }
         }
     }
 
+    private void broadcastShortcutIntent(String shortCutName, Bitmap favicon, Intent webIntent) {
+        Intent addIntent = new Intent(Constants.ACTION_INSTALL_SHORTCUT);
+        addIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, webIntent);
+        addIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, shortCutName);
+        addIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON, favicon);
+        sendBroadcast(addIntent);
+    }
+
     @Nullable
     private JResult extractWebsiteData(HtmlFetcher fetcher, String unShortenedUrl) {
         JResult res = null;
@@ -112,7 +114,7 @@ private Bitmap getFaviconBitmap(String faviconUrl) {
             favicon = Glide.with(this)
                     .load(faviconUrl)
                     .asBitmap()
-                    .into(-1, -1)
+                    .into(192, 192)
                     .get();
         } catch (InterruptedException | ExecutionException ignored) {
 
@@ -155,7 +157,7 @@ private Bitmap createIcon(@ColorInt int color, String shortCutName) {
         textPaint.setColor(ColorUtil.getForegroundWhiteOrBlack(color));
         textPaint.setStyle(Paint.Style.FILL);
 
-        drawTextInCanvasCentre(canvas, textPaint, getLetter(shortCutName));
+        drawTextInCanvasCentre(canvas, textPaint, Util.getFirstLetter(shortCutName));
         return icon;
     }
 
@@ -170,40 +172,13 @@ private void drawTextInCanvasCentre(Canvas canvas, Paint paint, String text) {
         canvas.drawText(text, x, y, paint);
     }
 
-    private String getLetter(String address) {
-        String result = "X";
-        if (address != null) {
-            try {
-                URL url = new URL(address);
-                String host = url.getHost();
-                if (host != null && host.length() != 0) {
-                    if (host.startsWith("www")) {
-                        String[] splits = host.split("\\.");
-                        if (splits.length > 1) result = String.valueOf(splits[1].charAt(0));
-                        else result = String.valueOf(splits[0].charAt(0));
-                    } else
-                        result = String.valueOf(host.charAt(0));
-                } else {
-                    if (address.length() != 0) {
-                        return String.valueOf(address.charAt(0));
-                    }
-                }
-            } catch (Exception e) {
-                if (address.length() != 0) {
-                    return String.valueOf(address.charAt(0));
-                } else return result;
-            }
-        }
-        return result.toUpperCase();
-    }
-
-    private boolean isValidFavicon(Bitmap favicon) {
+    private boolean isValidFavicon(@NonNull Bitmap favicon) {
         return !(favicon.getWidth() == 16 || favicon.getHeight() == 16
                 || favicon.getWidth() == 32 || favicon.getHeight() == 32);
     }
 
     private void legacyAdd(@NonNull String unShortenedUrl) {
-        Intent webIntent = getWebIntent(unShortenedUrl);
+        final Intent webIntent = getWebIntent(unShortenedUrl);
 
         String hostName = Uri.parse(unShortenedUrl).getHost();
         String shortcutName = hostName == null ? unShortenedUrl : hostName;
@@ -216,20 +191,14 @@ private void legacyAdd(@NonNull String unShortenedUrl) {
                 Intent.ShortcutIconResource.fromContext(
                         getApplicationContext(),
                         R.mipmap.ic_launcher));
-
         sendBroadcast(addIntent);
     }
 
     private void showToast(@NonNull final String msgToShow) {
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(new Runnable() {
-
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
             @Override
             public void run() {
-                Toast.makeText(
-                        AddHomeShortcutService.this,
-                        msgToShow,
-                        Toast.LENGTH_SHORT).show();
+                Toast.makeText(AddHomeShortcutService.this, msgToShow, Toast.LENGTH_SHORT).show();
             }
         });
     }

From c4d04b64c44f14e17cbde97d8d61e2e221e94f60 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 4 Oct 2016 00:15:56 +0530
Subject: [PATCH 03/15] Fix crash when user pops out of donate activity
 quickly.

---
 .../com/chromer/activities/payments/util/IabHelper.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/arun/com/chromer/activities/payments/util/IabHelper.java b/app/src/main/java/arun/com/chromer/activities/payments/util/IabHelper.java
index 2a98aae9..0bfbfebd 100644
--- a/app/src/main/java/arun/com/chromer/activities/payments/util/IabHelper.java
+++ b/app/src/main/java/arun/com/chromer/activities/payments/util/IabHelper.java
@@ -36,6 +36,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import timber.log.Timber;
+
 
 /**
  * Provides convenience methods for in-app billing. You can create one instance of this
@@ -770,6 +772,10 @@ void flagEndAsync() {
 
     int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteException {
         // Query purchases
+        if (mContext == null) {
+            Timber.d("User cancelled");
+            return BILLING_RESPONSE_RESULT_USER_CANCELED;
+        }
         logDebug("Querying owned items, item type: " + itemType);
         logDebug("Package name: " + mContext.getPackageName());
         boolean verificationFailed = false;

From 095d82cfe0db83fdd45b71d2b003020fc4dab2bf Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 4 Oct 2016 00:39:33 +0530
Subject: [PATCH 04/15] Minor fix

---
 .../java/arun/com/chromer/activities/CustomTabActivity.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
index 248cec1a..5bd3e492 100644
--- a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
+++ b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
@@ -183,6 +183,9 @@ protected void onPostExecute(Void aVoid) {
                 label = mUrl.toUpperCase();
             }
             Timber.d("Setting task description %s", label);
+            if (mIcon != null && mIcon.getWidth() < 0) {
+                mIcon = null;
+            }
             if (color != Constants.NO_COLOR) {
                 setTaskDescription(new ActivityManager.TaskDescription(label, mIcon, color));
             } else {

From cc7d54cc6e5197dccd23802728481dc91ee9cbc9 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 4 Oct 2016 00:59:11 +0530
Subject: [PATCH 05/15] Improvements to reduce loading flickering.

---
 .../chromer/activities/CustomTabActivity.java |  3 ++-
 .../com/chromer/customtabs/CustomTabs.java    | 23 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
index 5bd3e492..7006116c 100644
--- a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
+++ b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
@@ -57,6 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .forUrl(url)
                 .forWebHead(isWebhead)
                 .overrideToolbarColor(color)
+                .noAnimations(Preferences.aggressiveLoading(this))
                 .prepare()
                 .launch();
         Benchmark.end();
@@ -74,7 +75,7 @@ private void delayedGoToBack() {
             public void run() {
                 moveTaskToBack(true);
             }
-        }, 650);
+        }, 300);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
diff --git a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
index 69d70f6c..e094dcb1 100644
--- a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
+++ b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
@@ -119,6 +119,8 @@ public void openUri(Activity activity, Uri uri) {
 
     private CustomTabs(Activity context) {
         mActivity = context;
+        mForWebHead = false;
+        mNoAnimations = false;
     }
 
     /**
@@ -134,28 +136,31 @@ public static CustomTabs from(@NonNull Activity activity) {
     /**
      * Opens the URL on a Custom Tab if possible. Otherwise fallsback to opening it on a WebView.
      *
-     * @param activity         The host activity.
      * @param customTabsIntent a CustomTabsIntent to be used if Custom Tabs is available.
      * @param uri              the Uri to be opened.
      */
-    private static void openCustomTab(Activity activity, CustomTabsIntent customTabsIntent, Uri uri) {
-        final String packageName = getCustomTabPackage(activity);
+    private void openCustomTab(CustomTabsIntent customTabsIntent, Uri uri) {
+        final String packageName = getCustomTabPackage(mActivity);
 
         if (packageName != null) {
             customTabsIntent.intent.setPackage(packageName);
             Intent keepAliveIntent = new Intent()
-                    .setClassName(activity.getPackageName(), KeepAliveService.class.getCanonicalName());
+                    .setClassName(mActivity.getPackageName(), KeepAliveService.class.getCanonicalName());
             customTabsIntent.intent.putExtra(EXTRA_CUSTOM_TABS_KEEP_ALIVE, keepAliveIntent);
+
+            if (mNoAnimations) {
+                customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+            }
             try {
-                customTabsIntent.launchUrl(activity, uri);
+                customTabsIntent.launchUrl(mActivity, uri);
                 Timber.d("Launched url: %s", uri.toString());
             } catch (Exception e) {
-                CUSTOM_TABS_FALLBACK.openUri(activity, uri);
+                CUSTOM_TABS_FALLBACK.openUri(mActivity, uri);
                 Timber.e("Called fallback even though a package was found, weird Exception : %s", e.toString());
             }
         } else {
             Timber.e("Called fallback since no package found!");
-            CUSTOM_TABS_FALLBACK.openUri(activity, uri);
+            CUSTOM_TABS_FALLBACK.openUri(mActivity, uri);
         }
     }
 
@@ -293,8 +298,8 @@ public CustomTabs prepare() {
      */
     public void launch() {
         assertBuilderInitialized();
-        CustomTabsIntent customTabsIntent = mIntentBuilder.build();
-        openCustomTab(mActivity, customTabsIntent, Uri.parse(mUrl));
+        final CustomTabsIntent customTabsIntent = mIntentBuilder.build();
+        openCustomTab(customTabsIntent, Uri.parse(mUrl));
 
         // Dispose reference
         mActivity = null;

From 7c9851b9bf72974337930df14f7d648704647e8c Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Sun, 16 Oct 2016 02:00:22 +0530
Subject: [PATCH 06/15] Gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7e6b03ee..902bd2a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-rc1'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From ce626551a6e47e9a885e4d0e9efd61fd901a3964 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Sun, 16 Oct 2016 02:13:19 +0530
Subject: [PATCH 07/15] Reverting the flicker improvement changes

---
 .../com/chromer/activities/CustomTabActivity.java  |  4 ++--
 .../arun/com/chromer/customtabs/CustomTabs.java    | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
index 7006116c..885e0042 100644
--- a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
+++ b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
@@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .forUrl(url)
                 .forWebHead(isWebhead)
                 .overrideToolbarColor(color)
-                .noAnimations(Preferences.aggressiveLoading(this))
+                // .noAnimations(Preferences.aggressiveLoading(this))
                 .prepare()
                 .launch();
         Benchmark.end();
@@ -75,7 +75,7 @@ private void delayedGoToBack() {
             public void run() {
                 moveTaskToBack(true);
             }
-        }, 300);
+        }, 650);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
diff --git a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
index e094dcb1..f1d767b1 100644
--- a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
+++ b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
@@ -144,12 +144,13 @@ private void openCustomTab(CustomTabsIntent customTabsIntent, Uri uri) {
 
         if (packageName != null) {
             customTabsIntent.intent.setPackage(packageName);
-            Intent keepAliveIntent = new Intent()
-                    .setClassName(mActivity.getPackageName(), KeepAliveService.class.getCanonicalName());
+
+            final Intent keepAliveIntent = new Intent();
+            keepAliveIntent.setClassName(mActivity.getPackageName(), KeepAliveService.class.getCanonicalName());
             customTabsIntent.intent.putExtra(EXTRA_CUSTOM_TABS_KEEP_ALIVE, keepAliveIntent);
 
             if (mNoAnimations) {
-                customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+                // customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
             }
             try {
                 customTabsIntent.launchUrl(mActivity, uri);
@@ -278,17 +279,12 @@ public CustomTabs prepare() {
         // set defaults
         mIntentBuilder.setShowTitle(true);
         mIntentBuilder.enableUrlBarHiding();
-        mIntentBuilder.addDefaultShareMenuItem();  // TODO make this conditional
+        mIntentBuilder.addDefaultShareMenuItem();
 
-        // prepare animations
         prepareAnimations();
-        // prepare toolbar color
         prepareToolbar();
-        // prepare action button
         prepareActionButton();
-        // prepare all the menu items
         prepareMenuItems();
-        // prepare all bottom bar item
         prepareBottomBar();
         return this;
     }

From 5d46566effbf7750ce589a1da4fdc034ef1b6133 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Sun, 16 Oct 2016 02:27:21 +0530
Subject: [PATCH 08/15] Improving transparent theme

---
 app/src/main/AndroidManifest.xml       |  6 +++---
 app/src/main/res/values-v21/styles.xml |  9 +++++++++
 app/src/main/res/values/styles.xml     | 10 +++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8dcd3e04..24d7e675 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -74,7 +74,7 @@
         <activity
             android:name=".activities.CustomTabActivity"
             android:label="@string/app_name"
-            android:theme="@style/Transparent"/>
+            android:theme="@style/Theme.AppCompat.Translucent"/>
         <activity
             android:name=".activities.intro.ChromerIntro"
             android:label="Intro"
@@ -105,7 +105,7 @@
         <activity
             android:name=".activities.BrowserInterceptActivity"
             android:label="@string/app_name"
-            android:theme="@style/Transparent">
+            android:theme="@style/Theme.AppCompat.Translucent">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
@@ -140,7 +140,7 @@
             android:name=".webheads.helper.ProxyActivity"
             android:excludeFromRecents="true"
             android:noHistory="true"
-            android:theme="@style/Transparent"/>
+            android:theme="@style/Theme.AppCompat.Translucent"/>
 
         <service
             android:name=".webheads.qs.WebHeadTile"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index bc1bab48..af24d4ea 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -5,4 +5,13 @@
         <item name="android:windowBackground">@drawable/launch_screen</item>
         <item name="android:navigationBarColor">@color/colorPrimaryDarker</item>
     </style>
+
+    <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9b3832fb..2ec3ee20 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -71,12 +71,12 @@
         <item name="android:windowBackground">@drawable/launch_screen</item>
     </style>
 
-    <style name="Transparent" parent="AppTheme.NoActionBar">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
+    <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowNoTitle">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
     <style name="Preference_TextAppearanceMaterialBody2">

From a014cf660ef8bdb3e04c9978607a43d49b452008 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Sun, 16 Oct 2016 03:22:51 +0530
Subject: [PATCH 09/15] Make custom tabs truly launch in clients task.

If main activity is open then finish it by broadcasting an intent.
---
 .../java/arun/com/chromer/MainActivity.java   | 29 +++++++++++++++++--
 .../activities/BrowserInterceptActivity.java  | 11 +++++--
 .../arun/com/chromer/shared/Constants.java    |  1 +
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/arun/com/chromer/MainActivity.java b/app/src/main/java/arun/com/chromer/MainActivity.java
index 70e83e9f..bdf3eec0 100644
--- a/app/src/main/java/arun/com/chromer/MainActivity.java
+++ b/app/src/main/java/arun/com/chromer/MainActivity.java
@@ -1,7 +1,10 @@
 package arun.com.chromer;
 
 import android.app.ActivityOptions;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -81,6 +84,7 @@ public class MainActivity extends AppCompatActivity implements ColorChooserDialo
 
     private CustomTabManager mCustomTabManager;
     private Drawer mDrawer;
+    private BroadcastReceiver closeReceiver;
 
     @Override
     protected void onStart() {
@@ -121,6 +125,27 @@ protected void onCreate(Bundle savedInstanceState) {
         checkAndEducateUser(false);
 
         ServiceUtil.takeCareOfServices(getApplicationContext());
+
+        registerCloseReceiver();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(closeReceiver);
+    }
+
+    private void registerCloseReceiver() {
+        closeReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                Timber.d("Finished from receiver");
+                MainActivity.this.finish();
+            }
+        };
+        LocalBroadcastManager.getInstance(this).registerReceiver(
+                closeReceiver,
+                new IntentFilter(Constants.ACTION_CLOSE_MAIN));
     }
 
     private void setUpAppBarLayout() {
@@ -367,7 +392,7 @@ public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int s
     }
 
     private void checkAndEducateUser(boolean forceShow) {
-        List packages;
+        final List packages;
         if (!forceShow) {
             packages = CustomTabs.getCustomTabSupportingPackages(this);
         } else {
@@ -504,7 +529,7 @@ public class PagerAdapter extends FragmentPagerAdapter {
                 getString(R.string.customize)
         };
 
-        public PagerAdapter(FragmentManager fm) {
+        PagerAdapter(FragmentManager fm) {
             super(fm);
         }
 
diff --git a/app/src/main/java/arun/com/chromer/activities/BrowserInterceptActivity.java b/app/src/main/java/arun/com/chromer/activities/BrowserInterceptActivity.java
index 5da4395d..9322c2f3 100644
--- a/app/src/main/java/arun/com/chromer/activities/BrowserInterceptActivity.java
+++ b/app/src/main/java/arun/com/chromer/activities/BrowserInterceptActivity.java
@@ -12,6 +12,7 @@
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
@@ -39,6 +40,8 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        signalMainFinish();
+
         final boolean isFromNewTab = getIntent().getBooleanExtra(Constants.EXTRA_KEY_FROM_NEW_TAB, false);
 
         // Check if we should blacklist the launching app
@@ -83,9 +86,6 @@ protected void onCreate(Bundle savedInstanceState) {
             if (isFromNewTab || Preferences.mergeTabs(this)) {
                 customTabActivity.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
                 customTabActivity.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            } else {
-                customTabActivity.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                customTabActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
             }
             customTabActivity.putExtra(Constants.EXTRA_KEY_FROM_NEW_TAB, isFromNewTab);
             startActivity(customTabActivity);
@@ -94,6 +94,11 @@ protected void onCreate(Bundle savedInstanceState) {
         finish();
     }
 
+    private void signalMainFinish() {
+        LocalBroadcastManager.getInstance(this)
+                .sendBroadcast(new Intent(Constants.ACTION_CLOSE_MAIN));
+    }
+
     private void performBlacklistAction() {
         String componentFlatten = Preferences.secondaryBrowserComponent(this);
         if (componentFlatten != null && Util.isPackageInstalled(this, Preferences.secondaryBrowserPackage(this))) {
diff --git a/app/src/main/java/arun/com/chromer/shared/Constants.java b/app/src/main/java/arun/com/chromer/shared/Constants.java
index 259573d1..8c69881b 100644
--- a/app/src/main/java/arun/com/chromer/shared/Constants.java
+++ b/app/src/main/java/arun/com/chromer/shared/Constants.java
@@ -33,6 +33,7 @@ public class Constants {
     // Intent Actions
     public static final String ACTION_TOOLBAR_COLOR_SET = "ACTION_TOOLBAR_COLOR_SET";
     public static final String ACTION_WEBHEAD_COLOR_SET = "ACTION_WEBHEAD_COLOR_SET";
+    public static final String ACTION_CLOSE_MAIN = "ACTION_CLOSE_MAIN";
     public static final String ACTION_INSTALL_SHORTCUT = "com.android.launcher.action.INSTALL_SHORTCUT";
     public static final String ACTION_STOP_WEBHEAD_SERVICE = "close_service";
     public static final String ACTION_REBIND_WEBHEAD_TAB_CONNECTION = "rebind_event";

From f6e9fa36c6582ded2d82ed75eb0af28ba32cfe56 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 18 Oct 2016 01:14:15 +0530
Subject: [PATCH 10/15] Disabling bottom bar by default

---
 app/src/main/res/xml/bottombar_preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/xml/bottombar_preferences.xml b/app/src/main/res/xml/bottombar_preferences.xml
index cdf3d311..4159fcb8 100644
--- a/app/src/main/res/xml/bottombar_preferences.xml
+++ b/app/src/main/res/xml/bottombar_preferences.xml
@@ -5,7 +5,7 @@
                   android:title="@string/settings">
     <PreferenceCategory android:title="@string/bottom_bar">
         <arun.com.chromer.preferences.widgets.IconSwitchPreference
-            android:defaultValue="true"
+            android:defaultValue="false"
             android:key="bottombar_enabled_pref"
             android:summary="@string/bottom_bar_pref_summary"
             android:title="@string/bottom_bar_pref_title"/>

From 126377b188ffe255a3afe7cb287168af17d8fa72 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 18 Oct 2016 01:34:46 +0530
Subject: [PATCH 11/15] Minor refactor

---
 .../java/arun/com/chromer/customtabs/CustomTabs.java  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
index f1d767b1..a23c5f09 100644
--- a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
+++ b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
@@ -135,13 +135,11 @@ public static CustomTabs from(@NonNull Activity activity) {
 
     /**
      * Opens the URL on a Custom Tab if possible. Otherwise fallsback to opening it on a WebView.
-     *
-     * @param customTabsIntent a CustomTabsIntent to be used if Custom Tabs is available.
-     * @param uri              the Uri to be opened.
      */
-    private void openCustomTab(CustomTabsIntent customTabsIntent, Uri uri) {
+    private void openCustomTab() {
         final String packageName = getCustomTabPackage(mActivity);
-
+        final CustomTabsIntent customTabsIntent = mIntentBuilder.build();
+        final Uri uri = Uri.parse(mUrl);
         if (packageName != null) {
             customTabsIntent.intent.setPackage(packageName);
 
@@ -294,8 +292,7 @@ public CustomTabs prepare() {
      */
     public void launch() {
         assertBuilderInitialized();
-        final CustomTabsIntent customTabsIntent = mIntentBuilder.build();
-        openCustomTab(customTabsIntent, Uri.parse(mUrl));
+        openCustomTab();
 
         // Dispose reference
         mActivity = null;

From aec019814571c11b1ee380095e2cbfabb229a19a Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 18 Oct 2016 02:20:45 +0530
Subject: [PATCH 12/15] General share as preferred action.

---
 .../java/arun/com/chromer/customtabs/CustomTabs.java  | 11 +++++++++++
 .../com/chromer/preferences/manager/Preferences.java  |  1 +
 app/src/main/res/values/strings.xml                   |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
index a23c5f09..f8ea25cc 100644
--- a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
+++ b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
@@ -9,6 +9,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
@@ -467,6 +468,16 @@ private void prepareActionButton() {
                     mIntentBuilder.setActionButton(icon, mActivity.getString(R.string.fav_share_app), favSharePending);
                 }
                 break;
+            case Preferences.PREFERRED_ACTION_GEN_SHARE:
+                final Bitmap shareIcon = new IconicsDrawable(mActivity)
+                        .icon(CommunityMaterial.Icon.cmd_share_variant)
+                        .color(Color.WHITE)
+                        .sizeDp(24).toBitmap();
+                final Intent intent = new Intent(mActivity, ShareBroadcastReceiver.class);
+                final PendingIntent sharePending = PendingIntent.getBroadcast(mActivity, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                //noinspection ConstantConditions
+                mIntentBuilder.setActionButton(shareIcon, mActivity.getString(R.string.share_via), sharePending, true);
+                break;
         }
     }
 
diff --git a/app/src/main/java/arun/com/chromer/preferences/manager/Preferences.java b/app/src/main/java/arun/com/chromer/preferences/manager/Preferences.java
index fe7356cd..f0dd1f1b 100644
--- a/app/src/main/java/arun/com/chromer/preferences/manager/Preferences.java
+++ b/app/src/main/java/arun/com/chromer/preferences/manager/Preferences.java
@@ -33,6 +33,7 @@ public class Preferences {
     public static final String BOTTOM_BAR_ENABLED = "bottombar_enabled_pref";
     public static final int PREFERRED_ACTION_BROWSER = 1;
     public static final int PREFERRED_ACTION_FAV_SHARE = 2;
+    public static final int PREFERRED_ACTION_GEN_SHARE = 3;
     public static final int ANIMATION_MEDIUM = 1;
     public static final int ANIMATION_SHORT = 2;
     public static final String TOOLBAR_COLOR_PREF = "toolbar_color_pref";
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 503cd27c..f46bf8a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,10 +21,12 @@
     <string-array name="actionValues">
         <item>Secondary browser</item>
         <item>Favourite share app</item>
+        <item>General share</item>
     </string-array>
     <string-array name="actionKeys">
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Right</item>

From df42361c0689ba80a6e72260f4a0904ad49d4c65 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 18 Oct 2016 04:50:49 +0530
Subject: [PATCH 13/15] Ability to minimize opened tabs when in web head mode.

Overhauled bottom bar actions explanation view.
---
 app/src/main/AndroidManifest.xml              |   1 +
 .../chromer/activities/CustomTabActivity.java |  36 +++++-
 .../com/chromer/customtabs/CustomTabs.java    |  25 ++++-
 .../callbacks/MinimizeBroadcastReceiver.java  |  57 ++++++++++
 .../callbacks/ShareBroadcastReceiver.java     |   4 +-
 .../chromer/fragments/CustomizeFragment.java  | 106 ++++++++++++++++++
 .../BottomBarPreferenceFragment.java          |  26 +----
 .../arun/com/chromer/shared/Constants.java    |   2 +
 .../com/chromer/webheads/WebHeadService.java  |  28 ++---
 .../res/layout/bottom_action_template.xml     |  40 +++++++
 .../main/res/layout/customize_fragment.xml    |  17 +++
 app/src/main/res/values-de/strings.xml        |   5 +-
 app/src/main/res/values-es-rUS/strings.xml    |   3 +-
 app/src/main/res/values-hr/strings.xml        |   3 +-
 app/src/main/res/values-it/strings.xml        |   2 +
 app/src/main/res/values-nl/strings.xml        |   3 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   4 +-
 app/src/main/res/values-ru/strings.xml        |   4 +-
 app/src/main/res/values-sk/strings.xml        |   3 +-
 app/src/main/res/values-tr/strings.xml        |   1 +
 app/src/main/res/values-zh-rCN/strings.xml    |   4 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   3 +-
 app/src/main/res/values/strings.xml           |   8 +-
 23 files changed, 320 insertions(+), 65 deletions(-)
 create mode 100644 app/src/main/java/arun/com/chromer/customtabs/callbacks/MinimizeBroadcastReceiver.java
 create mode 100644 app/src/main/res/layout/bottom_action_template.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 24d7e675..1fa4baba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,6 +60,7 @@
         <receiver android:name=".customtabs.callbacks.SecondaryBrowserReceiver"/>
         <receiver android:name=".customtabs.callbacks.OpenInChromeReceiver"/>
         <receiver android:name=".customtabs.callbacks.OpenInNewTabReceiver"/>
+        <receiver android:name=".customtabs.callbacks.MinimizeBroadcastReceiver"/>
 
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
index 885e0042..c2c81700 100644
--- a/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
+++ b/app/src/main/java/arun/com/chromer/activities/CustomTabActivity.java
@@ -2,12 +2,17 @@
 
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.graphics.Palette;
 import android.widget.Toast;
@@ -34,6 +39,8 @@
 public class CustomTabActivity extends AppCompatActivity {
     private boolean isLoaded = false;
     private ExtractionTask mExtractionTask;
+    private String mBaseUrl = "";
+    private BroadcastReceiver mMinimizeReceiver;
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
@@ -46,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        final String url = getIntent().getDataString();
+        mBaseUrl = getIntent().getDataString();
         final boolean isWebhead = getIntent().getBooleanExtra(Constants.EXTRA_KEY_FROM_WEBHEAD, false);
 
         final WebSite webSite = getIntent().getParcelableExtra(Constants.EXTRA_KEY_WEBSITE);
@@ -54,7 +61,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Benchmark.start("Custom tab launching in CTA");
         CustomTabs.from(this)
-                .forUrl(url)
+                .forUrl(mBaseUrl)
                 .forWebHead(isWebhead)
                 .overrideToolbarColor(color)
                 // .noAnimations(Preferences.aggressiveLoading(this))
@@ -62,11 +69,29 @@ protected void onCreate(Bundle savedInstanceState) {
                 .launch();
         Benchmark.end();
 
-        dispatchDescriptionTask(webSite);
-
         if (Preferences.aggressiveLoading(this)) {
             delayedGoToBack();
         }
+
+        dispatchDescriptionTask(webSite);
+
+        registerMinimizeReceiver();
+    }
+
+    private void registerMinimizeReceiver() {
+        mMinimizeReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                Timber.d("Minimize called with %s : %s", mBaseUrl, intent.toString());
+                if (intent.getAction().equalsIgnoreCase(Constants.ACTION_MINIMIZE) && intent.hasExtra(Intent.EXTRA_TEXT)) {
+                    if (mBaseUrl.equalsIgnoreCase(intent.getStringExtra(Intent.EXTRA_TEXT))) {
+                        Timber.d("Minimized %s", intent.getStringExtra(Intent.EXTRA_TEXT));
+                        moveTaskToBack(true);
+                    }
+                }
+            }
+        };
+        LocalBroadcastManager.getInstance(this).registerReceiver(mMinimizeReceiver, new IntentFilter(Constants.ACTION_MINIMIZE));
     }
 
     private void delayedGoToBack() {
@@ -95,7 +120,7 @@ public void onResourceReady(Bitmap resource, GlideAnimation<? super Bitmap> glid
                             }
                         });
             } else {
-                mExtractionTask = new ExtractionTask(getIntent().getDataString());
+                mExtractionTask = new ExtractionTask(mBaseUrl);
                 mExtractionTask.execute();
             }
         }
@@ -116,6 +141,7 @@ protected void onDestroy() {
             mExtractionTask.cancel(true);
         }
         mExtractionTask = null;
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(mMinimizeReceiver);
     }
 
     @Override
diff --git a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
index f8ea25cc..b9a8e8b8 100644
--- a/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
+++ b/app/src/main/java/arun/com/chromer/customtabs/CustomTabs.java
@@ -26,11 +26,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import arun.com.chromer.R;
 import arun.com.chromer.customtabs.callbacks.AddHomeShortcutService;
 import arun.com.chromer.customtabs.callbacks.ClipboardService;
 import arun.com.chromer.customtabs.callbacks.FavShareBroadcastReceiver;
+import arun.com.chromer.customtabs.callbacks.MinimizeBroadcastReceiver;
 import arun.com.chromer.customtabs.callbacks.OpenInChromeReceiver;
 import arun.com.chromer.customtabs.callbacks.OpenInNewTabReceiver;
 import arun.com.chromer.customtabs.callbacks.SecondaryBrowserReceiver;
@@ -63,6 +65,7 @@ public class CustomTabs {
 
     private static final int BOTTOM_OPEN_TAB = 11;
     private static final int BOTTOM_SHARE_TAB = 12;
+    private static final int BOTTOM_MINIMIZE_TAB = 13;
     /**
      * Fallback in case there was en error launching custom tabs
      */
@@ -569,12 +572,12 @@ private void prepareBottomBar() {
         if (!Preferences.bottomBar(mActivity)) {
             return;
         }
-        int iconColor = ColorUtil.getForegroundWhiteOrBlack(mToolbarColor);
+        final int iconColor = ColorUtil.getForegroundWhiteOrBlack(mToolbarColor);
+
         if (Util.isLollipopAbove()) {
             final Intent openInNewTabIntent = new Intent(mActivity, OpenInNewTabReceiver.class);
             final PendingIntent pendingOpenTabIntent = PendingIntent.getBroadcast(mActivity, 0, openInNewTabIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-            Bitmap openTabIcon = new IconicsDrawable(mActivity)
+            final Bitmap openTabIcon = new IconicsDrawable(mActivity)
                     .icon(CommunityMaterial.Icon.cmd_plus_box)
                     .color(iconColor)
                     .sizeDp(24).toBitmap();
@@ -583,12 +586,24 @@ private void prepareBottomBar() {
 
         final Intent shareIntent = new Intent(mActivity, ShareBroadcastReceiver.class);
         final PendingIntent pendingShareIntent = PendingIntent.getBroadcast(mActivity, 0, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        Bitmap shareIcon = new IconicsDrawable(mActivity)
+        final Bitmap shareIcon = new IconicsDrawable(mActivity)
                 .icon(CommunityMaterial.Icon.cmd_share_variant)
                 .color(iconColor)
                 .sizeDp(24).toBitmap();
+
         mIntentBuilder.addToolbarItem(BOTTOM_SHARE_TAB, shareIcon, mActivity.getString(R.string.share), pendingShareIntent);
+
+        if (mForWebHead /* &&s Preferences.mergeTabs(mActivity) */) {
+            final Intent minimizeIntent = new Intent(mActivity, MinimizeBroadcastReceiver.class);
+            minimizeIntent.putExtra(Intent.EXTRA_TEXT, mUrl);
+            final PendingIntent pendingMin = PendingIntent.getBroadcast(mActivity, new Random().nextInt(), minimizeIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            final Bitmap minimizeIcon = new IconicsDrawable(mActivity)
+                    .icon(CommunityMaterial.Icon.cmd_flip_to_back)
+                    .color(iconColor)
+                    .sizeDp(24).toBitmap();
+
+            mIntentBuilder.addToolbarItem(BOTTOM_MINIMIZE_TAB, minimizeIcon, mActivity.getString(R.string.minimize), pendingMin);
+        }
     }
 
     /**
diff --git a/app/src/main/java/arun/com/chromer/customtabs/callbacks/MinimizeBroadcastReceiver.java b/app/src/main/java/arun/com/chromer/customtabs/callbacks/MinimizeBroadcastReceiver.java
new file mode 100644
index 00000000..a0b5a73b
--- /dev/null
+++ b/app/src/main/java/arun/com/chromer/customtabs/callbacks/MinimizeBroadcastReceiver.java
@@ -0,0 +1,57 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package arun.com.chromer.customtabs.callbacks;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.v4.content.LocalBroadcastManager;
+
+import arun.com.chromer.shared.Constants;
+import arun.com.chromer.webheads.WebHeadService;
+import timber.log.Timber;
+
+/**
+ * A BroadcastReceiver that handles the Action Intent from the Custom Tab and fires a Share Intent.
+ */
+public class MinimizeBroadcastReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String url = intent.getStringExtra(Intent.EXTRA_TEXT);
+        if (url != null) {
+            sendMinimizeIntent(context, url);
+            signalWebHead(context, url);
+        } else {
+            Timber.e("Error");
+        }
+    }
+
+    private void signalWebHead(Context context, @NonNull String url) {
+        final Intent webHeadService = new Intent(context, WebHeadService.class);
+        webHeadService.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        webHeadService.setData(Uri.parse(url));
+        webHeadService.putExtra(Constants.EXTRA_KEY_MINIMIZE, true);
+        context.startService(webHeadService);
+    }
+
+    private void sendMinimizeIntent(Context context, String url) {
+        final Intent minimizeIntent = new Intent(Constants.ACTION_MINIMIZE);
+        minimizeIntent.putExtra(Intent.EXTRA_TEXT, url);
+        LocalBroadcastManager.getInstance(context).sendBroadcastSync(minimizeIntent);
+    }
+}
diff --git a/app/src/main/java/arun/com/chromer/customtabs/callbacks/ShareBroadcastReceiver.java b/app/src/main/java/arun/com/chromer/customtabs/callbacks/ShareBroadcastReceiver.java
index 648401c4..64b9ceb8 100644
--- a/app/src/main/java/arun/com/chromer/customtabs/callbacks/ShareBroadcastReceiver.java
+++ b/app/src/main/java/arun/com/chromer/customtabs/callbacks/ShareBroadcastReceiver.java
@@ -19,6 +19,8 @@
 import android.content.Intent;
 import android.widget.Toast;
 
+import arun.com.chromer.R;
+
 /**
  * A BroadcastReceiver that handles the Action Intent from the Custom Tab and fires a Share Intent.
  */
@@ -37,7 +39,7 @@ public void onReceive(Context context, Intent intent) {
 
             context.startActivity(chooserIntent);
         } else {
-            Toast.makeText(context, "Try again!", Toast.LENGTH_SHORT).show();
+            Toast.makeText(context, R.string.invalid_link, Toast.LENGTH_SHORT).show();
         }
     }
 }
diff --git a/app/src/main/java/arun/com/chromer/fragments/CustomizeFragment.java b/app/src/main/java/arun/com/chromer/fragments/CustomizeFragment.java
index fae6c90e..fcdd5936 100644
--- a/app/src/main/java/arun/com/chromer/fragments/CustomizeFragment.java
+++ b/app/src/main/java/arun/com/chromer/fragments/CustomizeFragment.java
@@ -1,15 +1,34 @@
 package arun.com.chromer.fragments;
 
+import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.mikepenz.community_material_typeface_library.CommunityMaterial;
+import com.mikepenz.iconics.IconicsDrawable;
+
+import java.util.LinkedList;
+import java.util.List;
 
 import arun.com.chromer.R;
 import arun.com.chromer.preferences.BottomBarPreferenceFragment;
 import arun.com.chromer.preferences.PersonalizationPreferenceFragment;
+import arun.com.chromer.util.Util;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
 
@@ -19,6 +38,9 @@
 public class CustomizeFragment extends Fragment {
     private Unbinder mUnbinder;
 
+    @BindView(R.id.bottom_bar_action_list)
+    public RecyclerView mBottomActionsList;
+
     public static CustomizeFragment newInstance() {
         CustomizeFragment fragment = new CustomizeFragment();
         Bundle args = new Bundle();
@@ -41,6 +63,12 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
                 .replace(R.id.preference_container, PersonalizationPreferenceFragment.newInstance())
                 .replace(R.id.bottom_bar_container, BottomBarPreferenceFragment.newInstance())
                 .commit();
+        initBottomActions();
+    }
+
+    private void initBottomActions() {
+        mBottomActionsList.setLayoutManager(new LinearLayoutManager(getContext()));
+        mBottomActionsList.setAdapter(new BottomActionsAdapter(getActivity()));
     }
 
     @Override
@@ -48,4 +76,82 @@ public void onDestroyView() {
         super.onDestroyView();
         mUnbinder.unbind();
     }
+
+    public static class BottomActionsAdapter extends RecyclerView.Adapter<BottomActionsAdapter.BottomActionHolder> {
+        private static final String NEW_TAB = "NEW_TAB";
+        private static final String SHARE = "SHARE";
+        private static final String MINIMIZE = "MINIMIZE";
+        private final Context mContext;
+        private final List<String> mItems = new LinkedList<>();
+
+        BottomActionsAdapter(Context context) {
+            mContext = context;
+            if (Util.isLollipopAbove()) {
+                mItems.add(NEW_TAB);
+            }
+            mItems.add(SHARE);
+            mItems.add(MINIMIZE);
+        }
+
+        @Override
+        public BottomActionHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            return new BottomActionHolder(LayoutInflater.from(mContext).inflate(R.layout.bottom_action_template, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(BottomActionHolder holder, int position) {
+            final int iconColor = ContextCompat.getColor(mContext, R.color.colorAccentLighter);
+            switch (mItems.get(position)) {
+                case NEW_TAB:
+                    holder.icon.setImageDrawable(new IconicsDrawable(mContext)
+                            .icon(CommunityMaterial.Icon.cmd_plus_box)
+                            .color(iconColor)
+                            .sizeDp(18));
+                    holder.action.setText(html(R.string.open_in_new_tab_explanation));
+                    break;
+                case SHARE:
+                    holder.icon.setImageDrawable(new IconicsDrawable(mContext)
+                            .icon(CommunityMaterial.Icon.cmd_share_variant)
+                            .color(iconColor)
+                            .sizeDp(18));
+                    holder.action.setText(html(R.string.share_action_explanation));
+                    break;
+                case MINIMIZE:
+                    holder.icon.setImageDrawable(new IconicsDrawable(mContext)
+                            .icon(CommunityMaterial.Icon.cmd_flip_to_back)
+                            .color(iconColor)
+                            .sizeDp(18));
+                    holder.action.setText(html(R.string.minimize_action_explanation));
+                    break;
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            return mItems.size();
+        }
+
+        @NonNull
+        private Spanned html(@StringRes int res) {
+            final String string = mContext.getString(res);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                return Html.fromHtml(string, Html.FROM_HTML_MODE_LEGACY);
+            } else {
+                //noinspection deprecation
+                return Html.fromHtml(string);
+            }
+        }
+
+        class BottomActionHolder extends RecyclerView.ViewHolder {
+            @BindView(R.id.bottom_action)
+            TextView action;
+            @BindView(R.id.bottom_icon)
+            ImageView icon;
+
+            BottomActionHolder(View view) {
+                super(view);
+                ButterKnife.bind(this, view);
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/arun/com/chromer/preferences/BottomBarPreferenceFragment.java b/app/src/main/java/arun/com/chromer/preferences/BottomBarPreferenceFragment.java
index f8a39af1..039b17c2 100644
--- a/app/src/main/java/arun/com/chromer/preferences/BottomBarPreferenceFragment.java
+++ b/app/src/main/java/arun/com/chromer/preferences/BottomBarPreferenceFragment.java
@@ -3,10 +3,8 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.preference.Preference;
 import android.support.v7.preference.SwitchPreferenceCompat;
 
-import com.afollestad.materialdialogs.MaterialDialog;
 import com.mikepenz.community_material_typeface_library.CommunityMaterial;
 import com.mikepenz.iconics.IconicsDrawable;
 
@@ -15,8 +13,6 @@
 
 public class BottomBarPreferenceFragment extends DividerLessPreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private SwitchPreferenceCompat mBottomBarPreference;
-
     public BottomBarPreferenceFragment() {
         // Required empty public constructor
     }
@@ -37,29 +33,11 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     private void setupBottomBarPreference() {
-        mBottomBarPreference = (SwitchPreferenceCompat) findPreference(Preferences.BOTTOM_BAR_ENABLED);
-        mBottomBarPreference.setIcon(new IconicsDrawable(getActivity())
+        SwitchPreferenceCompat bottomBarPreference = (SwitchPreferenceCompat) findPreference(Preferences.BOTTOM_BAR_ENABLED);
+        bottomBarPreference.setIcon(new IconicsDrawable(getActivity())
                 .icon(CommunityMaterial.Icon.cmd_more)
                 .color(ContextCompat.getColor(getActivity(), R.color.material_dark_light))
                 .sizeDp(24));
-        if (mBottomBarPreference != null) {
-            mBottomBarPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    final SwitchPreferenceCompat switchCompat = (SwitchPreferenceCompat) preference;
-                    boolean isChecked = switchCompat.isChecked();
-
-                    if (isChecked && Preferences.dummyBottomBar(getActivity().getApplicationContext())) {
-                        new MaterialDialog.Builder(getActivity())
-                                .title(R.string.bottom_bar)
-                                .content(R.string.bottom_bar_expln)
-                                .positiveText(android.R.string.ok)
-                                .show();
-                    }
-                    return false;
-                }
-            });
-        }
     }
 
 
diff --git a/app/src/main/java/arun/com/chromer/shared/Constants.java b/app/src/main/java/arun/com/chromer/shared/Constants.java
index 8c69881b..f309a074 100644
--- a/app/src/main/java/arun/com/chromer/shared/Constants.java
+++ b/app/src/main/java/arun/com/chromer/shared/Constants.java
@@ -38,6 +38,7 @@ public class Constants {
     public static final String ACTION_STOP_WEBHEAD_SERVICE = "close_service";
     public static final String ACTION_REBIND_WEBHEAD_TAB_CONNECTION = "rebind_event";
     public static final String ACTION_CLOSE_WEBHEAD_BY_URL = "ACTION_CLOSE_WEBHEAD_BY_URL";
+    public static final String ACTION_MINIMIZE = "ACTION_MINIMIZE";
     // Extra keys
     public static final String EXTRA_KEY_SHOULD_REFRESH_BINDING = "EXTRA_KEY_SHOULD_REFRESH_BINDING";
     public static final String EXTRA_KEY_FROM_WEBHEAD = "EXTRA_KEY_FROM_WEBHEAD";
@@ -47,6 +48,7 @@ public class Constants {
     public static final String EXTRA_KEY_REBIND_WEBHEAD_CXN = "EXTRA_KEY_REBIND_WEBHEAD_CXN";
     public static final String EXTRA_KEY_FROM_NEW_TAB = "EXTRA_KEY_FROM_NEW_TAB";
     public static final String EXTRA_KEY_WEBSITE = "EXTRA_KEY_WEBSITE";
+    public static final String EXTRA_KEY_MINIMIZE = "EXTRA_KEY_MINIMIZE";
     // Request codes
     public static final int REQUEST_CODE_VOICE = 10001;
 
diff --git a/app/src/main/java/arun/com/chromer/webheads/WebHeadService.java b/app/src/main/java/arun/com/chromer/webheads/WebHeadService.java
index 6a31a227..8390b2b3 100644
--- a/app/src/main/java/arun/com/chromer/webheads/WebHeadService.java
+++ b/app/src/main/java/arun/com/chromer/webheads/WebHeadService.java
@@ -104,6 +104,8 @@ public void onCreate() {
         bindToCustomTabSession();
         registerReceivers();
         PageExtractTasksManager.registerListener(this);
+
+        showNotification();
     }
 
     @Override
@@ -137,10 +139,7 @@ public static CustomTabsSession getTabSession() {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        processIntentAndWebHead(intent);
-
-        showNotification();
-        // addTestWebHeads();
+        processIntent(intent);
         return START_STICKY;
     }
 
@@ -164,18 +163,20 @@ private void showNotification() {
         startForeground(1, notification);
     }
 
-    private void processIntentAndWebHead(Intent intent) {
+    private void processIntent(Intent intent) {
         if (intent == null || intent.getDataString() == null) return; // don't do anything
         final boolean isFromNewTab = intent.getBooleanExtra(Constants.EXTRA_KEY_FROM_NEW_TAB, false);
+        final boolean isMinimized = intent.getBooleanExtra(Constants.EXTRA_KEY_MINIMIZE, false);
 
         final String urlToLoad = intent.getDataString();
         if (!isLinkAlreadyLoaded(urlToLoad)) {
-            addWebHead(urlToLoad, isFromNewTab);
-        } else
+            addWebHead(urlToLoad, isFromNewTab, isMinimized);
+        } else if (!isMinimized) {
             Toast.makeText(this, R.string.already_loaded, Toast.LENGTH_SHORT).show();
+        }
     }
 
-    private void addWebHead(final String webHeadUrl, boolean isNewTab) {
+    private void addWebHead(final String webHeadUrl, final boolean isNewTab, final boolean isMinimized) {
         PageExtractTasksManager.startExtraction(webHeadUrl);
         mSpringChain2D.clear();
 
@@ -200,7 +201,7 @@ private void addWebHead(final String webHeadUrl, boolean isNewTab) {
         newWebHead.reveal();
         mWebHeads.put(webHeadUrl, newWebHead);
 
-        if (Preferences.aggressiveLoading(this)) {
+        if (Preferences.aggressiveLoading(this) && !isMinimized) {
             DocumentUtils.openNewCustomTab(this, newWebHead);
         }
     }
@@ -256,15 +257,6 @@ public void onResourceReady(Bitmap resource, GlideAnimation<? super Bitmap> glid
         }
     }
 
-    @SuppressWarnings("unused")
-    private void addTestWebHeads() {
-        //addWebHead("http://www.medium.com");
-        //addWebHead("https://www.linkedin.com/");
-        addWebHead("http://www.github.com", false);
-        addWebHead("http://www.androidpolice.com", false);
-        // addWebHead("https://bitbucket.org/");
-    }
-
     private boolean isLinkAlreadyLoaded(@Nullable String urlToLoad) {
         return urlToLoad == null || mWebHeads.containsKey(urlToLoad);
     }
diff --git a/app/src/main/res/layout/bottom_action_template.xml b/app/src/main/res/layout/bottom_action_template.xml
new file mode 100644
index 00000000..c6188ddf
--- /dev/null
+++ b/app/src/main/res/layout/bottom_action_template.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:orientation="vertical"
+                android:padding="5dp">
+
+    <ImageView
+        android:id="@+id/bottom_icon"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="3dp"
+        android:layout_marginRight="3dp"
+        android:scaleType="center"
+        android:src="@drawable/ic_launch_white_24dp"
+        tools:ignore="ContentDescription"/>
+
+    <TextView
+        android:id="@+id/bottom_action"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:layout_toEndOf="@+id/bottom_icon"
+        android:layout_toRightOf="@+id/bottom_icon"
+        android:gravity="center|start"
+        android:paddingEnd="15dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="15dp"
+        android:paddingStart="5dp"
+        android:text="@string/about"
+        android:textColor="@color/material_dark_light"
+        android:textSize="14sp"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/customize_fragment.xml b/app/src/main/res/layout/customize_fragment.xml
index c5afef59..9041cec0 100644
--- a/app/src/main/res/layout/customize_fragment.xml
+++ b/app/src/main/res/layout/customize_fragment.xml
@@ -52,6 +52,23 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"/>
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center|start"
+                    android:paddingLeft="45dp"
+                    android:paddingStart="45dp"
+                    android:text="@string/available_actions"
+                    android:textColor="@color/material_dark_light"
+                    android:textSize="14sp"
+                    android:textStyle="bold|italic"/>
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/bottom_bar_action_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="10dp"
+                    android:scrollbars="none"/>
             </LinearLayout>
 
         </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8ba139f3..8b6f7e94 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -21,10 +21,12 @@
     <string-array name="actionValues">
         <item>Sekundärer Browser</item>
         <item>Lieblings-Teil-App</item>
+        <item>General share</item>
     </string-array>
     <string-array name="actionKeys">
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Rechts</item>
@@ -151,7 +153,6 @@
     <string name="blacklist_explanation">Öffnest du einen Link aus einer ausgeschlossenen App, dann wird dieser im sekundären Browser geöffnet</string>
     <string name="revoke_accessibility_permission">Du kannst die Berechtigung für die Bedienungshilfe jetzt deaktivieren.</string>
     <string name="last_fetched_urls">Letzte geladene URLs</string>
-    <string name="blacklist_on">Ausgeschlossene Apps %1$s</string>
     <string name="translations">Übersetzungen</string>
     <string name="merge_tabs">Tabs und Apps zusammen anzeigen</string>
     <string name="merge_tabs_explanation">Zeige Tabs zusammen mit Apps im \“Zuletzt geöffnet\”-Screen an</string>
@@ -162,7 +163,7 @@
     <string name="bottom_bar">Bottom-Bar</string>
     <string name="open_in_new_tab">In neuem Tab öffnen</string>
     <string name="open_in_new_tab_error">Ungültiger Link. Hast du Text oder einen Link durch langes Drücken auf die Seite kopiert?</string>
-    <string name="bottom_bar_expln">Um sicherzugehen, dass die Bottom-Bar korrekt funktioniert wird empfohlen, die <b>aktuelle Chrome Version</b> als Custom-Tab-Anbieter zu verwenden. Ältere Versionen und andere Browser können Probleme verursachen.\n
+    <string name="bottom_bar_explanation">Um sicherzugehen, dass die Bottom-Bar korrekt funktioniert wird empfohlen, die <b>aktuelle Chrome Version</b> als Custom-Tab-Anbieter zu verwenden. Ältere Versionen und andere Browser können Probleme verursachen.\n
 \nDie Bottom-Bar bietet 2 Optionen:\n\n<b>In neuem Tab öffnen (5.0+) -</b> Kopiere Text oder einen Link vom Bildschirm und drücke auf dieses Icon, um den Link oder eine Suchen nach dem Text in einem neuen Custom Tab zu öffnen.\n<b>Teilen -</b> Öffne Android\'s Teilen-Dialog.\n\nMehr Aktionen kommen bald!</string>
     <string name="options">Einstellungen</string>
     <string name="customize">Anpassen</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index fe049c7d..381bc94e 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -11,7 +11,8 @@
     </string-array>
     <string-array name="actionValues">
         <item>Navegador secundario</item>
-        <item>"Aplicación favorita para compartir "</item>
+        <item>"Aplicación favorita para compartir"</item>
+        <item>General share</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Derecha</item>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a1b7cc32..7e77de72 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -12,6 +12,7 @@
     <string-array name="actionValues">
         <item>Sekundarni preglednik</item>
         <item>Aplikacija za dijeljenje</item>
+        <item>General share</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Desno</item>
@@ -144,7 +145,7 @@
     <string name="bottom_bar">Donja traka</string>
     <string name="open_in_new_tab">Otvori u novoj kartici</string>
     <string name="open_in_new_tab_error">Poveznica je nevažeća. Jeste li kopirali neki tekst ili poveznicu dugim pritiskom stranice?</string>
-    <string name="bottom_bar_expln">Da biste osigurali da donja traka radi ispravno preporučamo vam da postavite <b>najnoviju verziju Chromea</b> kao pružatelja prilagođenih kartica. Ostale verzije i preglednici možda neće funkcionirati. \n
+    <string name="bottom_bar_explanation">Da biste osigurali da donja traka radi ispravno preporučamo vam da postavite <b>najnoviju verziju Chromea</b> kao pružatelja prilagođenih kartica. Ostale verzije i preglednici možda neće funkcionirati. \n
 \nDonja traka omogućava dvije radnje: \n\n<b>Otvaranje u novoj kartici (5.0+) -</b> kopirajte poveznicu ili tekst na zaslonu i pritisnite ovu ikonu da biste otvorili poveznicu ili pretražili tekst u novoj prilagođenoj kartici.\n<b>Dijeljenje -</b> brzo izvedite Androidovu radnju dijeljenja. \n\n Više radnji dolazi uskoro.</string>
     <string name="options">Opcije</string>
     <string name="customize">Prilagodba</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a1ce8b41..3ddf92cf 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -13,10 +13,12 @@
     <string-array name="actionValues">
         <item>Browser secondario</item>
         <item>App di condivisione preferita</item>
+        <item>General share</item>
     </string-array>
     <string-array name="actionKeys">
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Destra</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d6df5ec5..8039da6f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -12,6 +12,7 @@
     <string-array name="actionValues">
         <item>Tweede browser</item>
         <item>Favoriete deel-app</item>
+        <item>General share</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Rechts</item>
@@ -154,7 +155,7 @@
     <string name="bottom_bar">Bar onderaan</string>
     <string name="open_in_new_tab">Openen op nieuw tabblad</string>
     <string name="open_in_new_tab_error">Ongeldige link, heb je wel tekst of een link gekopieerd door lang op de pagina te drukken?</string>
-    <string name="bottom_bar_expln">Om ervoor te zorgen dat de bar onderaan goed werkt wordt het aangeraden om <b>de nieuwste versie van Chrome</b> als aangepaste tabbladen-leverancier in te stellen. Oudere versies en andere browsers werken mogelijk niet.\n\nDe bar onderaan levert twee acties:\n\n<b>Openen op nieuw tabblad (5.0+) -</b> kopieer een link of tekst op het scherm en druk op dit icoon om de link te openen of de tekst in een nieuw aangepast tabblad te zoeken.\n<b>Delen-</b> snel de delen-functie van Android gebruiken.\n\nBinnenkort meer functies.</string>
+    <string name="bottom_bar_explanation">Om ervoor te zorgen dat de bar onderaan goed werkt wordt het aangeraden om <b>de nieuwste versie van Chrome</b> als aangepaste tabbladen-leverancier in te stellen. Oudere versies en andere browsers werken mogelijk niet.\n\nDe bar onderaan levert twee acties:\n\n<b>Openen op nieuw tabblad (5.0+) -</b> kopieer een link of tekst op het scherm en druk op dit icoon om de link te openen of de tekst in een nieuw aangepast tabblad te zoeken.\n<b>Delen-</b> snel de delen-functie van Android gebruiken.\n\nBinnenkort meer functies.</string>
     <string name="options">Opties</string>
     <string name="customize">Aanpassen</string>
     <string name="not_set">"Niet ingesteld "</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 577f7d97..9c71873e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -21,10 +21,12 @@
     <string-array name="actionValues">
         <item>Navegador secundário</item>
         <item>App para compartilhar favorito</item>
+        <item>General share</item>
     </string-array>
     <string-array name="actionKeys">
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Direita</item>
@@ -162,7 +164,7 @@
     <string name="bottom_bar">Barra Inferior</string>
     <string name="open_in_new_tab">Abrir em nova aba</string>
     <string name="open_in_new_tab_error">Link inválido, você copiou algum texto ou link dando um toque longo na página?</string>
-    <string name="bottom_bar_expln">Para assegurar que a barra funciona bem, definir a versão <b>mais recente do Chrome</b> como provedor de abas padrão é recomendado. Versões antigas e outros navegadores podem não funcionar. \n
+    <string name="bottom_bar_explanation">Para assegurar que a barra funciona bem, definir a versão <b>mais recente do Chrome</b> como provedor de abas padrão é recomendado. Versões antigas e outros navegadores podem não funcionar. \n
     \nA barra inferior fornece duas ações: \n\n<b>Abrir nova aba (5.0+) -</b>Copiar um link ou texto da tela e pressionar o botão para abrir o link ou pesquisar o texto em uma nova aba.\n<b>Compartilhar -</b> Usar rapidamente a ação de compartilhar nativa do Android. \n\n Mais ações virão em breve.</string>
     <string name="options">Opções</string>
     <string name="customize">Personalizar</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 12fb0ccf..712f5a64 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -21,10 +21,12 @@
     <string-array name="actionValues">
         <item>Вторичный браузер</item>
         <item>Избранное приложение для передачи</item>
+        <item>General share</item>
     </string-array>
     <string-array name="actionKeys">
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Право</item>
@@ -162,7 +164,7 @@
     <string name="bottom_bar">Нижняя панель</string>
     <string name="open_in_new_tab">Открыть в новой вкладке</string>
     <string name="open_in_new_tab_error">Неверная ссылка, вы точно скопировали текст или ссылку долгим нажатием на странице?</string>
-    <string name="bottom_bar_expln">Чтобы нижняя панель работала корректно, установите <b>актуальную версию Chrome</b> это рекомендуемый браузер для быстрых вкладок (custom tab). С более старыми версиями и другими браузерами может не работать. \n
+    <string name="bottom_bar_explanation">Чтобы нижняя панель работала корректно, установите <b>актуальную версию Chrome</b> это рекомендуемый браузер для быстрых вкладок (custom tab). С более старыми версиями и другими браузерами может не работать. \n
 \nНижняя панель обеспечивает две функции: \n\n<b>Открытие в новой вкладке (Андроид 5.0+) -</b> Копирование ссылки или текста на экране с последующим нажатием иконки на панели для перехода по ссылке или выполнения поиска выделенного текста в новой быстрой вкладке.\n<b>Поделиться -</b> Быстро выполнить стандартное Андроид действие Поделиться. \n\n Больше функций появится со временем.</string>
     <string name="options">Опции</string>
     <string name="customize">Настроить</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9c51a10c..5db5293c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -16,6 +16,7 @@
     <string-array name="actionValues">
         <item>Sekundárny prehliadač</item>
         <item>Aplikácia pre zdieľanie</item>
+        <item>General share</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Vpravo</item>
@@ -152,7 +153,7 @@
     <string name="bottom_bar">Dolná lišta</string>
     <string name="open_in_new_tab">Otvoriť na novej karte</string>
     <string name="open_in_new_tab_error">Neplatný odkaz, skopírovali ste text alebo odkaz dlhým podržaním?</string>
-    <string name="bottom_bar_expln">Pre zaistenie funkčnosti dolnej lišty, je potrebné nastaviť <b>najnovšiu verziu Chrome</b> ako poskytovateľa Custom Tabs. Staršie verzie a iné prehliadače nemusia fungovať. \n 
+    <string name="bottom_bar_explanation">Pre zaistenie funkčnosti dolnej lišty, je potrebné nastaviť <b>najnovšiu verziu Chrome</b> ako poskytovateľa Custom Tabs. Staršie verzie a iné prehliadače nemusia fungovať. \n
     \nDolná lišta poskytuje dve akcie:
 \n\n<b>Otvoriť na novej karte (5.0+) -</b> Skopírujte odkaz alebo text na obrazovke a kliknite na túto ikonu pre otvorenie odkazu alebo vyhľadanie textu na novej karte.\n<b>Zdieľať -</b> Rýchle spustenie akcie zdieľania. \n\nViac akcií neskôr.</string>
     <string name="options">Možnosti</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b1a163da..f234db7a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -12,6 +12,7 @@
     <string-array name="actionValues">
         <item>İkincil tarayıcı</item>
         <item>Sık kullanılan paylaşım uygulaması</item>
+        <item>General share</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>Sağ</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3f083f64..cd8e2a15 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -21,10 +21,12 @@
     <string-array name="actionValues">
         <item>第二浏览器</item>
         <item>最喜欢的分享应用</item>
+        <item>General share</item>
     </string-array>
     <string-array name="actionKeys">
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>右侧</item>
@@ -161,7 +163,7 @@
     <string name="bottom_bar">底栏</string>
     <string name="open_in_new_tab">在新标签页中打开</string>
     <string name="open_in_new_tab_error">无效的链接，您是否已通过长按页面操作复制了文本或者链接？</string>
-    <string name="bottom_bar_expln">为了确保底栏功能正常工作，建议使用 <b>最新版本的 Chrome 浏览器</b>作为自定义标签页的提供程序。较旧版本或其他的浏览器将可能导致无法正常工作。\n
+    <string name="bottom_bar_explanation">为了确保底栏功能正常工作，建议使用 <b>最新版本的 Chrome 浏览器</b>作为自定义标签页的提供程序。较旧版本或其他的浏览器将可能导致无法正常工作。\n
 \n底栏内提供两种操作：\n\n<b>在新标签页中打开 (需安卓 5.0+) -</b> 复制屏幕上的链接或文本后点击图标来选择在新打开的标签页内加载链接或搜索关键词。\n<b>分享 -</b> 快速执行安卓系统内的分享操作。 \n\n 后续还将添加更多操作。</string>
     <string name="options">选项</string>
     <string name="customize">自定义</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f136d62f..5ac0b116 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -16,6 +16,7 @@
     <string-array name="actionValues">
         <item>第二順位瀏覽器</item>
         <item>喜好的分享應用程式</item>
+        <item>General share</item>
     </string-array>
     <string-array name="webHeadsSpawnValues">
         <item>右側</item>
@@ -149,7 +150,7 @@
     <string name="bottom_bar">底層工具列</string>
     <string name="open_in_new_tab">在新分頁中開啟</string>
     <string name="open_in_new_tab_error">無效的連結。請問您有透過長按頁面來複製任何連結或文字嗎？</string>
-    <string name="bottom_bar_expln">為了確保底部工具列能正常運作，建議您設定<b>最新的 Chrome 版本</b> 做為自訂分頁的提供者。 舊的版本或者其他瀏覽器可能無法正常運作。
+    <string name="bottom_bar_explanation">為了確保底部工具列能正常運作，建議您設定<b>最新的 Chrome 版本</b> 做為自訂分頁的提供者。 舊的版本或者其他瀏覽器可能無法正常運作。
 
 底部工具列提供兩個功能：
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f46bf8a3..2acf9ef4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,8 +174,7 @@
     <string name="bottom_bar">Bottom Bar</string>
     <string name="open_in_new_tab">Open in new tab</string>
     <string name="open_in_new_tab_error">Invalid link, have you copied any text or link by long pressing the page?</string>
-    <string name="bottom_bar_expln">To ensure bottom bar works properly, setting <b>latest Chrome version</b> as custom tab provider is recommended. Older versions and other browsers may not work. \n
-    \nBottom bar provides two actions: \n\n<b>Open in new tab (5.0+) -</b> Copy a link or text on screen and press this icon to launch the link or search the text in a new custom tab.\n<b>Share -</b> Quickly perform Android share action. \n\n More actions coming soon.</string>
+    <string name="bottom_bar_explanation">To ensure bottom bar works properly, setting <b>latest Chrome version</b> as custom tab provider is recommended. Older versions and other browsers may not work.</string>
     <string name="options">Options</string>
     <string name="customize">Customize</string>
     <string name="not_set">Not Set</string>
@@ -212,4 +211,9 @@
     <string name="improves_loading_times">Improves loading times</string>
     <string name="web_close_on_open_desc">Web heads will disappear once you open the link</string>
     <string name="web_close_on_open_title">Close web heads once clicked.</string>
+    <string name="minimize">Minimize</string>
+    <string name="open_in_new_tab_explanation"><![CDATA[<b>Open in new tab (5.0+) -</b> Copy a link or text on screen and press this icon to launch the link or search the copied text in a new custom or bubble.]]></string>
+    <string name="share_action_explanation"><![CDATA[<b>Share -</b> Quickly perform Android share action.]]></string>
+    <string name="minimize_action_explanation"><![CDATA[<b>Minimize -</b> Will minimize the current page back to a bubble. Only available if web heads is turned on.]]></string>
+    <string name="available_actions">Available actions</string>
 </resources>

From 33d3bf9a39321909349dcdef2aa9f25535bc0e74 Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 18 Oct 2016 04:57:43 +0530
Subject: [PATCH 14/15] Lint fixes

---
 .../preferences/BehaviorPreferenceFragment.java       | 11 +++++------
 app/src/main/res/values-de/strings.xml                |  4 +---
 app/src/main/res/values-hr/strings.xml                |  2 --
 app/src/main/res/values-nl/strings.xml                |  1 -
 app/src/main/res/values-pt-rBR/strings.xml            |  2 --
 app/src/main/res/values-ru/strings.xml                |  2 --
 app/src/main/res/values-sk/strings.xml                |  3 ---
 app/src/main/res/values-zh-rCN/strings.xml            |  2 --
 app/src/main/res/values-zh-rTW/strings.xml            |  9 ---------
 app/src/main/res/values/strings.xml                   |  1 -
 10 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/arun/com/chromer/preferences/BehaviorPreferenceFragment.java b/app/src/main/java/arun/com/chromer/preferences/BehaviorPreferenceFragment.java
index 5cfeba36..48e8fb64 100644
--- a/app/src/main/java/arun/com/chromer/preferences/BehaviorPreferenceFragment.java
+++ b/app/src/main/java/arun/com/chromer/preferences/BehaviorPreferenceFragment.java
@@ -23,7 +23,6 @@
  */
 public class BehaviorPreferenceFragment extends DividerLessPreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private IconSwitchPreference mBlackListPreference;
     private IconSwitchPreference mMergeTabsPreference;
 
     public BehaviorPreferenceFragment() {
@@ -47,15 +46,15 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     private void setupBlacklistPreference() {
-        mBlackListPreference = (IconSwitchPreference) findPreference(Preferences.BLACKLIST_DUMMY);
-        if (mBlackListPreference != null) {
+        IconSwitchPreference blackListPreference = (IconSwitchPreference) findPreference(Preferences.BLACKLIST_DUMMY);
+        if (blackListPreference != null) {
             Drawable recentImg = new IconicsDrawable(getActivity())
                     .icon(CommunityMaterial.Icon.cmd_filter_variant)
                     .color(ContextCompat.getColor(getActivity(), R.color.material_dark_light))
                     .sizeDp(24);
-            mBlackListPreference.setIcon(recentImg);
-            mBlackListPreference.hideSwitch();
-            mBlackListPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            blackListPreference.setIcon(recentImg);
+            blackListPreference.hideSwitch();
+            blackListPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
                     Intent blacklistedApps = new Intent(getActivity(), BlacklistManagerActivity.class);
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8b6f7e94..08ad39e3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -142,7 +142,7 @@
     <string name="web_heads_service">Web Heads Dienst</string>
     <string name="join_beta">Beta beitreten</string>
     <string name="become_a_tester">Tester werden</string>
-    <string name="join_beta_content">“Beta Versionen sind experimentell. Sie haben die neuesten Funktionen, enthalten jedoch auch Fehler. Du kannst bei der Entwicklung helfen, indem du als Tester mitmachst und Fehler in der Google+ Community meldest. \n\nBitte stelle sicher,  dass du der Community beigetreten bist und klicke dann auf den Button \”Tester werden\". \n\nBEACHTE: Du musst der Community beitreten um Tester zu werden. "</string>
+    <string name="join_beta_content">“Beta Versionen sind experimentell. Sie haben die neuesten Funktionen, enthalten jedoch auch Fehler. Du kannst bei der Entwicklung helfen, indem du als Tester mitmachst und Fehler in der Google+ Community meldest. \n\nBitte stelle sicher,  dass du der Community beigetreten bist und klicke dann auf den Button \”Tester werden\“. \n\nBEACHTE: Du musst der Community beitreten um Tester zu werden. ”</string>
     <string name="no_voice_rec_apps">Keine kompatible Spracherkennungs App gefunden</string>
     <string name="blacklisted_apps">Ausgeschlossene Apps (Blacklist)</string>
     <string name="blacklisted_explanation">Verhindere, dass Chromer Links von bestimmten Apps verarbeitet</string>
@@ -163,8 +163,6 @@
     <string name="bottom_bar">Bottom-Bar</string>
     <string name="open_in_new_tab">In neuem Tab öffnen</string>
     <string name="open_in_new_tab_error">Ungültiger Link. Hast du Text oder einen Link durch langes Drücken auf die Seite kopiert?</string>
-    <string name="bottom_bar_explanation">Um sicherzugehen, dass die Bottom-Bar korrekt funktioniert wird empfohlen, die <b>aktuelle Chrome Version</b> als Custom-Tab-Anbieter zu verwenden. Ältere Versionen und andere Browser können Probleme verursachen.\n
-\nDie Bottom-Bar bietet 2 Optionen:\n\n<b>In neuem Tab öffnen (5.0+) -</b> Kopiere Text oder einen Link vom Bildschirm und drücke auf dieses Icon, um den Link oder eine Suchen nach dem Text in einem neuen Custom Tab zu öffnen.\n<b>Teilen -</b> Öffne Android\'s Teilen-Dialog.\n\nMehr Aktionen kommen bald!</string>
     <string name="options">Einstellungen</string>
     <string name="customize">Anpassen</string>
     <string name="not_set">nicht gesetzt</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 7e77de72..b31bddce 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -145,8 +145,6 @@
     <string name="bottom_bar">Donja traka</string>
     <string name="open_in_new_tab">Otvori u novoj kartici</string>
     <string name="open_in_new_tab_error">Poveznica je nevažeća. Jeste li kopirali neki tekst ili poveznicu dugim pritiskom stranice?</string>
-    <string name="bottom_bar_explanation">Da biste osigurali da donja traka radi ispravno preporučamo vam da postavite <b>najnoviju verziju Chromea</b> kao pružatelja prilagođenih kartica. Ostale verzije i preglednici možda neće funkcionirati. \n
-\nDonja traka omogućava dvije radnje: \n\n<b>Otvaranje u novoj kartici (5.0+) -</b> kopirajte poveznicu ili tekst na zaslonu i pritisnite ovu ikonu da biste otvorili poveznicu ili pretražili tekst u novoj prilagođenoj kartici.\n<b>Dijeljenje -</b> brzo izvedite Androidovu radnju dijeljenja. \n\n Više radnji dolazi uskoro.</string>
     <string name="options">Opcije</string>
     <string name="customize">Prilagodba</string>
     <string name="not_set">Nije postavljeno</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8039da6f..bc183e74 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -155,7 +155,6 @@
     <string name="bottom_bar">Bar onderaan</string>
     <string name="open_in_new_tab">Openen op nieuw tabblad</string>
     <string name="open_in_new_tab_error">Ongeldige link, heb je wel tekst of een link gekopieerd door lang op de pagina te drukken?</string>
-    <string name="bottom_bar_explanation">Om ervoor te zorgen dat de bar onderaan goed werkt wordt het aangeraden om <b>de nieuwste versie van Chrome</b> als aangepaste tabbladen-leverancier in te stellen. Oudere versies en andere browsers werken mogelijk niet.\n\nDe bar onderaan levert twee acties:\n\n<b>Openen op nieuw tabblad (5.0+) -</b> kopieer een link of tekst op het scherm en druk op dit icoon om de link te openen of de tekst in een nieuw aangepast tabblad te zoeken.\n<b>Delen-</b> snel de delen-functie van Android gebruiken.\n\nBinnenkort meer functies.</string>
     <string name="options">Opties</string>
     <string name="customize">Aanpassen</string>
     <string name="not_set">"Niet ingesteld "</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9c71873e..ca49cc75 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -164,8 +164,6 @@
     <string name="bottom_bar">Barra Inferior</string>
     <string name="open_in_new_tab">Abrir em nova aba</string>
     <string name="open_in_new_tab_error">Link inválido, você copiou algum texto ou link dando um toque longo na página?</string>
-    <string name="bottom_bar_explanation">Para assegurar que a barra funciona bem, definir a versão <b>mais recente do Chrome</b> como provedor de abas padrão é recomendado. Versões antigas e outros navegadores podem não funcionar. \n
-    \nA barra inferior fornece duas ações: \n\n<b>Abrir nova aba (5.0+) -</b>Copiar um link ou texto da tela e pressionar o botão para abrir o link ou pesquisar o texto em uma nova aba.\n<b>Compartilhar -</b> Usar rapidamente a ação de compartilhar nativa do Android. \n\n Mais ações virão em breve.</string>
     <string name="options">Opções</string>
     <string name="customize">Personalizar</string>
     <string name="not_set">Não Definido</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 712f5a64..26480820 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -164,8 +164,6 @@
     <string name="bottom_bar">Нижняя панель</string>
     <string name="open_in_new_tab">Открыть в новой вкладке</string>
     <string name="open_in_new_tab_error">Неверная ссылка, вы точно скопировали текст или ссылку долгим нажатием на странице?</string>
-    <string name="bottom_bar_explanation">Чтобы нижняя панель работала корректно, установите <b>актуальную версию Chrome</b> это рекомендуемый браузер для быстрых вкладок (custom tab). С более старыми версиями и другими браузерами может не работать. \n
-\nНижняя панель обеспечивает две функции: \n\n<b>Открытие в новой вкладке (Андроид 5.0+) -</b> Копирование ссылки или текста на экране с последующим нажатием иконки на панели для перехода по ссылке или выполнения поиска выделенного текста в новой быстрой вкладке.\n<b>Поделиться -</b> Быстро выполнить стандартное Андроид действие Поделиться. \n\n Больше функций появится со временем.</string>
     <string name="options">Опции</string>
     <string name="customize">Настроить</string>
     <string name="not_set">Не задано</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 5db5293c..9093366a 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -153,9 +153,6 @@
     <string name="bottom_bar">Dolná lišta</string>
     <string name="open_in_new_tab">Otvoriť na novej karte</string>
     <string name="open_in_new_tab_error">Neplatný odkaz, skopírovali ste text alebo odkaz dlhým podržaním?</string>
-    <string name="bottom_bar_explanation">Pre zaistenie funkčnosti dolnej lišty, je potrebné nastaviť <b>najnovšiu verziu Chrome</b> ako poskytovateľa Custom Tabs. Staršie verzie a iné prehliadače nemusia fungovať. \n
-    \nDolná lišta poskytuje dve akcie:
-\n\n<b>Otvoriť na novej karte (5.0+) -</b> Skopírujte odkaz alebo text na obrazovke a kliknite na túto ikonu pre otvorenie odkazu alebo vyhľadanie textu na novej karte.\n<b>Zdieľať -</b> Rýchle spustenie akcie zdieľania. \n\nViac akcií neskôr.</string>
     <string name="options">Možnosti</string>
     <string name="customize">Prispôsobiť</string>
     <string name="not_set">Nenastavené</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cd8e2a15..d6a07f35 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -163,8 +163,6 @@
     <string name="bottom_bar">底栏</string>
     <string name="open_in_new_tab">在新标签页中打开</string>
     <string name="open_in_new_tab_error">无效的链接，您是否已通过长按页面操作复制了文本或者链接？</string>
-    <string name="bottom_bar_explanation">为了确保底栏功能正常工作，建议使用 <b>最新版本的 Chrome 浏览器</b>作为自定义标签页的提供程序。较旧版本或其他的浏览器将可能导致无法正常工作。\n
-\n底栏内提供两种操作：\n\n<b>在新标签页中打开 (需安卓 5.0+) -</b> 复制屏幕上的链接或文本后点击图标来选择在新打开的标签页内加载链接或搜索关键词。\n<b>分享 -</b> 快速执行安卓系统内的分享操作。 \n\n 后续还将添加更多操作。</string>
     <string name="options">选项</string>
     <string name="customize">自定义</string>
     <string name="not_set">未设置</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5ac0b116..bafc403f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -150,15 +150,6 @@
     <string name="bottom_bar">底層工具列</string>
     <string name="open_in_new_tab">在新分頁中開啟</string>
     <string name="open_in_new_tab_error">無效的連結。請問您有透過長按頁面來複製任何連結或文字嗎？</string>
-    <string name="bottom_bar_explanation">為了確保底部工具列能正常運作，建議您設定<b>最新的 Chrome 版本</b> 做為自訂分頁的提供者。 舊的版本或者其他瀏覽器可能無法正常運作。
-
-底部工具列提供兩個功能：
-
-<b>在新分頁中開啟(Android 5.0或更新版本)-</b>
-複製螢幕中的連結或文字然後點選圖示來開啟連結或在新分頁中搜尋文字。
-<b>分享-</b>快速顯示Android的分享功能。
-
-更多功能即將推出。</string>
     <string name="options">選項</string>
     <string name="customize">定制</string>
     <string name="not_set">尚未設定</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2acf9ef4..3617d9ac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,7 +174,6 @@
     <string name="bottom_bar">Bottom Bar</string>
     <string name="open_in_new_tab">Open in new tab</string>
     <string name="open_in_new_tab_error">Invalid link, have you copied any text or link by long pressing the page?</string>
-    <string name="bottom_bar_explanation">To ensure bottom bar works properly, setting <b>latest Chrome version</b> as custom tab provider is recommended. Older versions and other browsers may not work.</string>
     <string name="options">Options</string>
     <string name="customize">Customize</string>
     <string name="not_set">Not Set</string>

From 837a6d0c4e34813713fb1301e2e5a37acec3218e Mon Sep 17 00:00:00 2001
From: Arunkumar <arunk.beece@gmail.com>
Date: Tue, 18 Oct 2016 05:10:04 +0530
Subject: [PATCH 15/15] Bump version and update changelog

---
 app/build.gradle                      | 4 ++--
 app/src/main/res/values/changelog.xml | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e2e43034..7f69dc9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "arun.com.chromer"
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 24
-        versionName "1.6"
+        versionCode 25
+        versionName "1.6.1"
 
         buildConfigField "String", "BASE_64", getBase64()
     }
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
index 129378c9..76af5f99 100644
--- a/app/src/main/res/values/changelog.xml
+++ b/app/src/main/res/values/changelog.xml
@@ -18,8 +18,15 @@ a {
 <body>
 <strong>You can view this again in the about screen.</strong>
 <br></br>
-<strong>1.6</strong>
+<strong>1.6.1</strong>
 <a href="https://goo.gl/photos/BzRV69ABov9zJxVu9">  View album</a>
+<ul>
+    <li><b>NEW:</b> <b>Minimize web heads</b> - added a button in bottom bar to minimize current open page back to web head.</li>
+    <li><b>NEW:</b> <b>General share as preferred action</b></li>
+    <li><b>IMPROVED:</b> Many performance and crash fixes.</li>
+    <li><b>IMPROVED:</b> Translation updates.</li>
+</ul>
+<strong>1.6</strong>
 <h4 class="list-heading">Web heads</h3>
 <ul>
     <li><b>NEW:</b> <b>Grouped web heads</b> and much smoother animations.</li>