Restore Ghostery status logo

ghostery · Feb 20, 2019 · bde4ad2 · bde4ad2
1 parent 7baa922
commit bde4ad2
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 69 deletions.
diff --git a/mozilla-release/mobile/android/app/build.gradle b/mozilla-release/mobile/android/app/build.gradle
@@ -35,7 +35,7 @@ android {
         manifestPlaceholders = project.ext.manifestPlaceholders
 
         /* Cliqz start */
-        versionCode getVersionCode(124)
+        versionCode getVersionCode(125)
         /* Cliqz end */
         applicationId mozconfig.substs.ANDROID_PACKAGE_NAME
         testApplicationId 'org.mozilla.roboexample.test'

diff --git a/mozilla-release/mobile/android/app/src/main/res/drawable-hdpi/ic_status_logo.png b/mozilla-release/mobile/android/app/src/main/res/drawable-hdpi/ic_status_logo.png
diff --git a/mozilla-release/mobile/android/app/src/main/res/drawable-xhdpi/ic_status_logo.png b/mozilla-release/mobile/android/app/src/main/res/drawable-xhdpi/ic_status_logo.png
diff --git a/mozilla-release/mobile/android/app/src/main/res/drawable-xxhdpi/ic_status_logo.png b/mozilla-release/mobile/android/app/src/main/res/drawable-xxhdpi/ic_status_logo.png
diff --git a/...lla-release/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_status_logo.png b/...lla-release/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_status_logo.png
diff --git a/mozilla-release/mobile/android/base/java/org/mozilla/gecko/CliqzLoadingSearchHelper.java b/mozilla-release/mobile/android/base/java/org/mozilla/gecko/CliqzLoadingSearchHelper.java
@@ -105,18 +105,8 @@ public boolean isStarted() {
         return !mStopped;
     }
 
-    @SuppressWarnings("RedundantCast")
-    @SuppressLint("ObsoleteSdkInt")
     private void initView() {
         mLoadingSearchContainer = loadingSearchStub.inflate();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            final Context context = mLoadingSearchContainer.getContext();
-            final ProgressBar progressBar =
-                    (ProgressBar) mLoadingSearchContainer.findViewById(android.R.id.progress);
-            final Drawable drawable = progressBar.getIndeterminateDrawable();
-            drawable.setColorFilter(ContextCompat.getColor(context, android.R.color.white),
-                    PorterDuff.Mode.SRC_IN);
-        }
     }
 
     private class ScheduledShow implements Runnable {

diff --git a/mozilla-release/mobile/android/branding/cliqz-alpha/res/drawable/ic_status_logo.xml b/mozilla-release/mobile/android/branding/cliqz-alpha/res/drawable/ic_status_logo.xml
diff --git a/mozilla-release/mobile/android/branding/cliqz/res/drawable/ic_status_logo.xml b/mozilla-release/mobile/android/branding/cliqz/res/drawable/ic_status_logo.xml
diff --git a/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable/ic_status_logo.xml b/mozilla-release/mobile/android/branding/ghostery-alpha/res/drawable/ic_status_logo.xml
diff --git a/mozilla-release/mobile/android/branding/ghostery/res/drawable/ic_status_logo.xml b/mozilla-release/mobile/android/branding/ghostery/res/drawable/ic_status_logo.xml