Backed out changeset dac98c423104 (bug 1379066)

mobile/android/app/src/photon/res/layout/toolbar_display_layout.xml

@@ -48,10 +48,11 @@
         android:orientation="horizontal"
         android:visibility="gone" />
 
-    <org.mozilla.gecko.widget.themed.ThemedImageButton
+    <ImageButton
         android:id="@+id/stop"
-        style="@style/UrlBar.ImageButton"
-        android:background="@drawable/action_bar_button"
+        android:layout_width="@dimen/page_action_button_width"
+        android:layout_height="match_parent"
+        android:background="#00ffffff"
         android:contentDescription="@string/stop"
         android:src="@drawable/urlbar_stop"
         android:visibility="gone" />

mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java

@@ -19,7 +19,6 @@ import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
-import org.mozilla.gecko.skin.SkinConfig;
 import org.mozilla.gecko.toolbar.BrowserToolbarTabletBase.ForwardButtonAnimation;
 import org.mozilla.gecko.Experiments;
 import org.mozilla.gecko.util.HardwareUtils;
@@ -106,6 +105,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
     private OnTitleChangeListener mTitleChangeListener;
 
     private final ThemedImageButton mSiteSecurity;
+
     private final ImageButton mStop;
     private OnStopListener mStopListener;
 
@@ -170,12 +170,6 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
     public void setPrivateMode(boolean isPrivate) {
         super.setPrivateMode(isPrivate);
         mSiteSecurity.setPrivateMode(isPrivate);
-
-        // Bug 1375351 should change class type to ThemedImageButton to avoid casting
-        if (SkinConfig.isPhoton()) {
-            ((ThemedImageButton)mStop).setPrivateMode(isPrivate);
-        }
-
         mPageActionLayout.setPrivateMode(isPrivate);
     }
 
@@ -433,7 +427,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout {
         mTitle.setPadding(0, 0, (!isShowingProgress ? mTitlePadding : 0), 0);
     }
 
-    List<? extends View> getFocusOrder() {
+    List<View> getFocusOrder() {
         return Arrays.asList(mSiteSecurity, mPageActionLayout, mStop);
     }