diff --git a/mobile/android/app/src/main/res/drawable-hdpi/tracking_protection_toolbar_illustration.png b/mobile/android/app/src/main/res/drawable-hdpi/tracking_protection_toolbar_illustration.png
deleted file mode 100644
index e6749cbc8a32..000000000000
Binary files a/mobile/android/app/src/main/res/drawable-hdpi/tracking_protection_toolbar_illustration.png and /dev/null differ
diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/tracking_protection_toolbar_illustration.png b/mobile/android/app/src/main/res/drawable-xhdpi/tracking_protection_toolbar_illustration.png
deleted file mode 100644
index 223deed57aed..000000000000
Binary files a/mobile/android/app/src/main/res/drawable-xhdpi/tracking_protection_toolbar_illustration.png and /dev/null differ
diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/tracking_protection_toolbar_illustration.png b/mobile/android/app/src/main/res/drawable-xxhdpi/tracking_protection_toolbar_illustration.png
deleted file mode 100644
index 555b3f6a2b95..000000000000
Binary files a/mobile/android/app/src/main/res/drawable-xxhdpi/tracking_protection_toolbar_illustration.png and /dev/null differ
diff --git a/mobile/android/app/src/main/res/layout/tracking_protection_prompt.xml b/mobile/android/app/src/main/res/layout/tracking_protection_prompt.xml
deleted file mode 100644
index 5095df9508f3..000000000000
--- a/mobile/android/app/src/main/res/layout/tracking_protection_prompt.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index b12ba7a90b24..4fab27a4081e 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -205,10 +205,6 @@
android:permission="android.permission.BIND_JOB_SERVICE">
-
-
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index e32981795e25..d2509e21913e 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -143,7 +143,6 @@ import org.mozilla.gecko.toolbar.BrowserToolbar;
import org.mozilla.gecko.toolbar.BrowserToolbar.CommitEventSource;
import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState;
import org.mozilla.gecko.toolbar.PwaConfirm;
-import org.mozilla.gecko.trackingprotection.TrackingProtectionPrompt;
import org.mozilla.gecko.updater.PostUpdateHandler;
import org.mozilla.gecko.updater.UpdateServiceHelper;
import org.mozilla.gecko.util.ActivityUtils;
@@ -2182,20 +2181,6 @@ public class BrowserApp extends GeckoApp
Tabs.getInstance().addPrivateTab();
}
- public void showTrackingProtectionPromptIfApplicable() {
- final SharedPreferences prefs = getSharedPreferences();
-
- final boolean hasTrackingProtectionPromptBeShownBefore = prefs.getBoolean(GeckoPreferences.PREFS_TRACKING_PROTECTION_PROMPT_SHOWN, false);
-
- if (hasTrackingProtectionPromptBeShownBefore) {
- return;
- }
-
- prefs.edit().putBoolean(GeckoPreferences.PREFS_TRACKING_PROTECTION_PROMPT_SHOWN, true).apply();
-
- startActivity(new Intent(BrowserApp.this, TrackingProtectionPrompt.class));
- }
-
@Override
public void showNormalTabs() {
showTabs(TabsPanel.Panel.NORMAL_TABS);
diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
index 674956f2fd0f..3b9227e52e37 100644
--- a/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
+++ b/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
@@ -119,7 +119,6 @@ public class GeckoPreferences
public static final String NON_PREF_PREFIX = "android.not_a_preference.";
public static final String INTENT_EXTRA_RESOURCES = "resource";
- public static final String PREFS_TRACKING_PROTECTION_PROMPT_SHOWN = NON_PREF_PREFIX + "trackingProtectionPromptShown";
public static final String PREFS_HEALTHREPORT_UPLOAD_ENABLED = NON_PREF_PREFIX + "healthreport.uploadEnabled";
public static final String PREFS_SYNC = NON_PREF_PREFIX + "sync";
diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
index 20181a208d04..af906b683780 100644
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
@@ -60,8 +60,6 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
private static final int MIN_DOMAIN_SCROLL_MARGIN_DP = 10;
- private boolean mTrackingProtectionEnabled;
-
// To be used with updateFromTab() to allow the caller
// to give enough context for the requested state change.
enum UpdateFlags {
@@ -363,7 +361,6 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
final int imageLevel = type.getImageLevel();
mSiteIdentityPopup.setSiteIdentity(siteIdentity);
- mTrackingProtectionEnabled = SecurityModeUtil.isTrackingProtectionEnabled(siteIdentity);
if (mSecurityImageLevel != imageLevel) {
mSecurityImageLevel = imageLevel;
@@ -423,10 +420,6 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
final boolean shouldShowThrobber = tab.getState() == Tab.STATE_LOADING;
updateUiMode(shouldShowThrobber ? UIMode.PROGRESS : UIMode.DISPLAY);
-
- if (Tab.STATE_SUCCESS == tab.getState() && mTrackingProtectionEnabled) {
- mActivity.showTrackingProtectionPromptIfApplicable();
- }
}
private void updateUiMode(UIMode uiMode) {
diff --git a/mobile/android/base/java/org/mozilla/gecko/trackingprotection/TrackingProtectionPrompt.java b/mobile/android/base/java/org/mozilla/gecko/trackingprotection/TrackingProtectionPrompt.java
deleted file mode 100644
index dcc62b6d4439..000000000000
--- a/mobile/android/base/java/org/mozilla/gecko/trackingprotection/TrackingProtectionPrompt.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.trackingprotection;
-
-import org.mozilla.gecko.Locales;
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.preferences.GeckoPreferences;
-import org.mozilla.gecko.util.HardwareUtils;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.MotionEvent;
-import android.view.View;
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-
-public class TrackingProtectionPrompt extends Locales.LocaleAwareActivity {
- public static final String LOGTAG = "Gecko" + TrackingProtectionPrompt.class.getSimpleName();
-
- // Flag set during animation to prevent animation multiple-start.
- private boolean isAnimating;
-
- private View containerView;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- showPrompt();
- }
-
- private void showPrompt() {
- setContentView(R.layout.tracking_protection_prompt);
-
- findViewById(R.id.ok_button).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- onConfirmButtonPressed();
- }
- });
- findViewById(R.id.link_text).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- slideOut();
- final Intent settingsIntent = new Intent(TrackingProtectionPrompt.this, GeckoPreferences.class);
- GeckoPreferences.setResourceToOpen(settingsIntent, "preferences_privacy");
- startActivity(settingsIntent);
-
- // Don't use a transition to settings if we're on a device where that
- // would look bad.
- if (HardwareUtils.IS_KINDLE_DEVICE) {
- overridePendingTransition(0, 0);
- }
- }
- });
-
- containerView = findViewById(R.id.tracking_protection_inner_container);
-
- containerView.setTranslationY(500);
- containerView.setAlpha(0);
-
- final Animator translateAnimator = ObjectAnimator.ofFloat(containerView, "translationY", 0);
- translateAnimator.setDuration(400);
-
- final Animator alphaAnimator = ObjectAnimator.ofFloat(containerView, "alpha", 1);
- alphaAnimator.setStartDelay(200);
- alphaAnimator.setDuration(600);
-
- final AnimatorSet set = new AnimatorSet();
- set.playTogether(alphaAnimator, translateAnimator);
- set.setStartDelay(400);
-
- set.start();
- }
-
- @Override
- public void finish() {
- super.finish();
-
- // Don't perform an activity-dismiss animation.
- overridePendingTransition(0, 0);
- }
-
- private void onConfirmButtonPressed() {
- slideOut();
- }
-
- /**
- * Slide the overlay down off the screen and destroy it.
- */
- private void slideOut() {
- if (isAnimating) {
- return;
- }
-
- isAnimating = true;
-
- ObjectAnimator animator = ObjectAnimator.ofFloat(containerView, "translationY", containerView.getHeight());
- animator.addListener(new AnimatorListenerAdapter() {
-
- @Override
- public void onAnimationEnd(Animator animation) {
- finish();
- }
-
- });
- animator.start();
- }
-
- /**
- * Close the dialog if back is pressed.
- */
- @Override
- public void onBackPressed() {
- slideOut();
- }
-
- /**
- * Close the dialog if the anything that isn't a button is tapped.
- */
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- slideOut();
- return true;
- }
- }
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 68ec405bd917..14c3fe5c0fef 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -328,11 +328,6 @@
-
-
-
-
-
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index c63f900ee438..da64c8c016a3 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -290,11 +290,6 @@
&pref_update_autodownload_never;
&pref_update_autodownload_always;
- &tracking_protection_prompt_title;
- &tracking_protection_prompt_text;
- &tracking_protection_prompt_tip_text;
- &tracking_protection_prompt_action_button;
-
&pref_tab_queue_title3;
&pref_tab_queue_summary4;
&tab_queue_prompt_title;