Merge branch 'release' of https://github.com/substratum/substratum in…

…to release

.gitignore

@@ -9,3 +9,4 @@
 *.apk
 keystore.properties
 *.jks
+output.json

app/build.gradle

@@ -50,8 +50,8 @@ android {
         applicationId "projekt.substratum"
         minSdkVersion 24
         targetSdkVersion 27
-        versionCode 983
-        versionName "nine hundred eighty three"
+        versionCode 994
+        versionName "nine hundred ninety four"
         buildConfigField "java.util.Date", "buildTime", "new java.util.Date(" + System.currentTimeMillis() + "L)"
         buildConfigField "String", "GIT_HASH", "\"${gitHash()}\""
     }
@@ -102,10 +102,9 @@ android {
 }
 
 ext {
-    leakCanaryVersion = '1.5.4'
     supportLibsVersion = '27.1.1'
     firebaseVersion = '15.0.0'
-    glideVersion = '4.6.1'
+    glideVersion = '4.7.1'
 }
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
@@ -122,9 +121,9 @@ dependencies {
     implementation "com.android.support:preference-v14:$supportLibsVersion"
 
     // Firebase
-    implementation "com.google.firebase:firebase-core:$firebaseVersion"
-    implementation "com.google.firebase:firebase-crash:$firebaseVersion"
-    implementation "com.google.firebase:firebase-database:$firebaseVersion"
+    implementation "com.google.firebase:firebase-core:15.0.2"
+    implementation "com.google.firebase:firebase-crash:15.0.2"
+    implementation "com.google.firebase:firebase-database:15.0.1"
 
     // Image Downloading and Caching
     implementation "com.github.bumptech.glide:glide:$glideVersion"
@@ -135,7 +134,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.5'
 
     // APK Signer
-    implementation 'com.android.tools.build:apksig:3.1.1'
+    implementation 'com.android.tools.build:apksig:3.1.2'
 
     // App Intro
     implementation 'com.stephentuso:welcome:1.4.1'

app/src/main/java/projekt/substratum/InformationActivity.java

@@ -121,6 +121,7 @@
 import static projekt.substratum.common.Internal.IV_ENCRYPTION_KEY_EXTRA;
 import static projekt.substratum.common.Internal.MIX_AND_MATCH;
 import static projekt.substratum.common.Internal.MIX_AND_MATCH_IA_TO_OVERLAYS;
+import static projekt.substratum.common.Internal.SCROLL_UP;
 import static projekt.substratum.common.Internal.SHEET_COMMAND;
 import static projekt.substratum.common.Internal.START_JOB_ACTION;
 import static projekt.substratum.common.Internal.THEME_NAME;
@@ -522,14 +523,6 @@ protected void onCreate(Bundle savedInstanceState) {
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
         toolbar.setNavigationOnClickListener(v -> onBackPressed());
-        toolbar.setOnClickListener(v -> {
-            if (Overlays.recyclerView != null) {
-                Overlays.recyclerView.smoothScrollToPosition(0);
-            }
-            if (Wallpapers.recyclerView != null) {
-                Wallpapers.recyclerView.smoothScrollToPosition(0);
-            }
-        });
 
         // Hero Image
         try {
@@ -780,6 +773,23 @@ public void onTabReselected(TabLayout.Tab tab) {
             }
         });
 
+        toolbar.setOnClickListener(v -> {
+            if (adapt != null) {
+                Intent intent = new Intent();
+                Object obj = adapt.instantiateItem(viewPager, tabPosition);
+                switch (obj.getClass().getSimpleName().toLowerCase(Locale.US)) {
+                    case overlaysFragment:
+                        intent = new Intent("Overlays" + START_JOB_ACTION);
+                        intent.putExtra(SHEET_COMMAND, SCROLL_UP);
+                        break;
+                    case wallpaperFragment:
+                        intent = new Intent("Wallpapers" + START_JOB_ACTION);
+                        break;
+                }
+                localBroadcastManager.sendBroadcast(intent);
+            }
+        });
+
         // This is for the Floating Action Menu actions
         Intent intent = new Intent("Overlays" + START_JOB_ACTION);
         if (!Systems.checkOMS(this) && !Systems.isSamsungDevice(context)) {
@@ -937,7 +947,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
                 (!isOMS && !Root.checkRootAccess())) {
             menu.findItem(R.id.restart_systemui).setVisible(false);
         }
-        if (!isOMS) {
+        if (Systems.isNewSamsungDeviceAndromeda(context) || !isOMS) {
             menu.findItem(R.id.disable).setVisible(false);
             menu.findItem(R.id.enable).setVisible(false);
         }