Bug 1177612 - Contextual hint first time we show the tracking protection shield. r=margaret
authorMartyn Haigh <mhaigh@mozilla.org>
Wed, 05 Aug 2015 15:15:46 +0100
changeset 288581 02fd2b5d1df3648c15021952577ba264dea3352f
parent 288580 43134f901bab522d700c8ae259fbc2bd2da3188c
child 288582 0366b96fc771908beca587ceabff16775c9cb8ce
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs1177612
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1177612 - Contextual hint first time we show the tracking protection shield. r=margaret
mobile/android/base/BrowserApp.java
mobile/android/base/resources/drawable-hdpi/ic_tracking_protection.png
mobile/android/base/resources/drawable-hdpi/tracking_protection_toolbar_illustration.png
mobile/android/base/resources/drawable-xhdpi/ic_tracking_protection.png
mobile/android/base/resources/drawable-xhdpi/tracking_protection_toolbar_illustration.png
mobile/android/base/resources/drawable-xxhdpi/ic_tracking_protection.png
mobile/android/base/resources/drawable-xxhdpi/tracking_protection_toolbar_illustration.png
mobile/android/base/resources/layout/tracking_protection_prompt.xml
mobile/android/base/toolbar/ToolbarDisplayLayout.java
mobile/android/tests/browser/robocop/PixelTest.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -2054,21 +2054,19 @@ public class BrowserApp extends GeckoApp
     @Override
     public void addTab() {
         Tabs.getInstance().addTab();
     }
 
     @Override
     public void addPrivateTab() {
         Tabs.getInstance().addPrivateTab();
-
-        showTrackingProtectionPromptIfApplicable();
     }
 
-    private void showTrackingProtectionPromptIfApplicable() {
+    public void showTrackingProtectionPromptIfApplicable() {
         final SharedPreferences prefs = getSharedPreferences();
 
         final boolean hasTrackingProtectionPromptBeShownBefore = prefs.getBoolean(GeckoPreferences.PREFS_TRACKING_PROTECTION_PROMPT_SHOWN, false);
 
         if (hasTrackingProtectionPromptBeShownBefore) {
             return;
         }
 
deleted file mode 100644
index ff6fb6d8078cd4f2930f6000644f3fa82045dd7a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9984d7f3ecfc9ba314d078c723a7e75a4a8015cc
GIT binary patch
literal 2474
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
deleted file mode 100644
index c95a4876e1317196132a14cbf8277aba60764b0b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..744d3573ca8b450dbf8063b843d322a83c3f80eb
GIT binary patch
literal 3450
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
deleted file mode 100644
index edf20af1178d65921e7ea29bc086cef5443d64d6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c86b5baae04eb8d83ff58dbad1d38e84d0df9c5
GIT binary patch
literal 5660
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
awB6ZzI1UqRe|!QDo?{BLGA0{czWsj(rdVPC
--- a/mobile/android/base/resources/layout/tracking_protection_prompt.xml
+++ b/mobile/android/base/resources/layout/tracking_protection_prompt.xml
@@ -18,17 +18,17 @@
             android:layout_width="@dimen/overlay_prompt_container_width"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center"
             android:background="@android:color/white"
             android:orientation="vertical">
 
         <ImageView android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:src="@drawable/ic_tracking_protection"
+                   android:src="@drawable/tracking_protection_toolbar_illustration"
                    android:layout_gravity="center"
                    android:layout_marginTop="40dp"
                    android:layout_marginBottom="20dp" />
 
         <TextView
                 android:id="@+id/title"
                 android:layout_width="@dimen/overlay_prompt_content_width"
                 android:layout_height="wrap_content"
--- a/mobile/android/base/toolbar/ToolbarDisplayLayout.java
+++ b/mobile/android/base/toolbar/ToolbarDisplayLayout.java
@@ -60,16 +60,17 @@ import android.widget.ImageButton;
 *
 * {@code ToolbarDisplayLayout} is meant to be owned by {@code BrowserToolbar}
 * which is the main event bus for the toolbar subsystem.
 */
 public class ToolbarDisplayLayout extends ThemedLinearLayout
                                   implements Animation.AnimationListener {
 
     private static final String LOGTAG = "GeckoToolbarDisplayLayout";
+    private boolean mTrackingProtectionEnabled;
 
     // To be used with updateFromTab() to allow the caller
     // to give enough context for the requested state change.
     enum UpdateFlags {
         TITLE,
         FAVICON,
         PROGRESS,
         SITE_IDENTITY,
@@ -200,17 +201,17 @@ public class ToolbarDisplayLayout extend
         mStop.setOnClickListener(new Button.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (mStopListener != null) {
                     // Force toolbar to switch to Display mode
                     // immediately based on the stopped tab.
                     final Tab tab = mStopListener.onStop();
                     if (tab != null) {
-                        updateUiMode(tab, UIMode.DISPLAY, EnumSet.noneOf(UpdateFlags.class));
+                        updateUiMode(UIMode.DISPLAY, EnumSet.noneOf(UpdateFlags.class));
                     }
                 }
             }
         });
 
         float slideWidth = getResources().getDimension(R.dimen.browser_toolbar_site_security_width);
 
         LayoutParams siteSecParams = (LayoutParams) mSiteSecurity.getLayoutParams();
@@ -452,26 +453,32 @@ public class ToolbarDisplayLayout extend
             imageLevel = LEVEL_WARNING_MINOR;
         }
 
         if (mSecurityImageLevel != imageLevel) {
             mSecurityImageLevel = imageLevel;
             mSiteSecurity.setImageLevel(mSecurityImageLevel);
             updatePageActions(flags);
         }
+
+        mTrackingProtectionEnabled = trackingMode == TrackingMode.TRACKING_CONTENT_BLOCKED;
     }
 
     private void updateProgress(Tab tab, EnumSet<UpdateFlags> flags) {
         final boolean shouldShowThrobber = (tab != null &&
                                             tab.getState() == Tab.STATE_LOADING);
 
-        updateUiMode(tab, shouldShowThrobber ? UIMode.PROGRESS : UIMode.DISPLAY, flags);
+        updateUiMode(shouldShowThrobber ? UIMode.PROGRESS : UIMode.DISPLAY, flags);
+
+        if (Tab.STATE_SUCCESS == tab.getState() && mTrackingProtectionEnabled) {
+            mActivity.showTrackingProtectionPromptIfApplicable();
+        }
     }
 
-    private void updateUiMode(Tab tab, UIMode uiMode, EnumSet<UpdateFlags> flags) {
+    private void updateUiMode(UIMode uiMode, EnumSet<UpdateFlags> flags) {
         if (mUiMode == uiMode) {
             return;
         }
 
         mUiMode = uiMode;
 
         // The "Throbber start" and "Throbber stop" log messages in this method
         // are needed by S1/S2 tests (http://mrcote.info/phonedash/#).
--- a/mobile/android/tests/browser/robocop/PixelTest.java
+++ b/mobile/android/tests/browser/robocop/PixelTest.java
@@ -58,21 +58,16 @@ abstract class PixelTest extends BaseTes
         if (isPrivate) {
             selectMenuItem(mStringHelper.NEW_PRIVATE_TAB_LABEL);
         } else {
             selectMenuItem(mStringHelper.NEW_TAB_LABEL);
         }
         tabEventExpecter.blockForEvent();
         contentEventExpecter.blockForEvent();
 
-        if (isPrivate) {
-            waitForText(mStringHelper.TRACKING_PROTECTION_PROMPT_TITLE);
-            mSolo.clickOnText(mStringHelper.TRACKING_PROTECTION_PROMPT_BUTTON);
-        }
-
         waitForText(mStringHelper.TITLE_PLACE_HOLDER);
         loadAndPaint(url);
         tabEventExpecter.unregisterListener();
         contentEventExpecter.unregisterListener();
     }
 
     protected final PaintedSurface waitForPaint(Actions.RepeatedEventExpecter expecter) {
         expecter.blockUntilClear(PAINT_CLEAR_DELAY);