Backed out 3 changesets (bug 1393274) for android lint failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Thu, 31 Aug 2017 11:40:09 -0700
changeset 378105 250d13bd254cb6aae1caf2d5973c16846027e8e8
parent 378104 25801e787df453260f00d106d29816109eac9557
child 378106 4f95bb8143aa3a4d43aca222753bd6aeee1d9394
push id94412
push userarchaeopteryx@coole-files.de
push dateFri, 01 Sep 2017 08:46:09 +0000
treeherdermozilla-inbound@d56571d7f1be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1393274
milestone57.0a1
backs out52e7fa268a65a5d96177f8ff145a88201b38d3b7
29e8bf6a34c1548c7c28aca618d03795a2f3cbc8
03063f77c3f566c8d3f05878616b3f4c47171757
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
Backed out 3 changesets (bug 1393274) for android lint failures a=backout Backed out changeset 52e7fa268a65 (bug 1393274) Backed out changeset 29e8bf6a34c1 (bug 1393274) Backed out changeset 03063f77c3f5 (bug 1393274) MozReview-Commit-ID: 5BOV55zQaFf
mobile/android/app/src/main/res/layout/activity_stream_card_history_item.xml
mobile/android/app/src/main/res/layout/activity_stream_webpage_item_row.xml
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WebpageItemRow.java
rename from mobile/android/app/src/main/res/layout/activity_stream_webpage_item_row.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_card_history_item.xml
--- a/mobile/android/app/src/main/res/layout/activity_stream_webpage_item_row.xml
+++ b/mobile/android/app/src/main/res/layout/activity_stream_card_history_item.xml
@@ -13,17 +13,17 @@
     <!-- On some devices, marginBottom is ignored for Views within a RelativeLayout.
          Wrapping in a FrameLayout appears to be a sufficient workaround for this issue -->
     <FrameLayout
         android:id="@+id/icon_wrapper"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
         <org.mozilla.gecko.activitystream.homepanel.stream.StreamOverridablePageIconLayout
-                android:id="@+id/page_icon"
+                android:id="@+id/icon"
                 android:layout_width="@dimen/favicon_bg"
                 android:layout_height="@dimen/favicon_bg"
                 android:layout_marginStart="@dimen/activity_stream_base_margin"
                 android:layout_marginLeft="@dimen/activity_stream_base_margin"
                 android:layout_marginTop="@dimen/activity_stream_base_margin"
                 android:layout_marginBottom="@dimen/activity_stream_base_margin"
                 android:layout_gravity="center"
                 tools:background="@drawable/favicon_globe" />
@@ -37,91 +37,76 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_gravity="right|end|top"
         android:contentDescription="@string/menu"
         android:paddingBottom="16dp"
         android:paddingTop="16dp" />
 
-    <!-- In RTL locales, we don't want a large horizontal gap between the domain, page title and source
-         text so we set textAlignment=viewStart for all of them so that it's to the left in LTR and
-         right in RTL. -->
     <TextView
-        android:id="@+id/page_domain"
+        android:id="@+id/page"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toEndOf="@id/icon_wrapper"
         android:layout_toLeftOf="@id/menu"
         android:layout_toRightOf="@id/icon_wrapper"
         android:layout_toStartOf="@id/menu"
         android:paddingLeft="@dimen/activity_stream_base_margin"
         android:paddingStart="@dimen/activity_stream_base_margin"
-        android:paddingRight="0dp"
-        android:paddingEnd="0dp"
         android:paddingTop="@dimen/activity_stream_base_margin"
-        android:textAlignment="viewStart"
         android:textColor="@color/activity_stream_subtitle"
         android:textSize="12sp"
         tools:text="twitter" />
 
-    <!-- See id/page_domain for textAlignment comment. -->
     <TextView
-        android:id="@+id/page_title"
+        android:id="@+id/card_history_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/page_domain"
+        android:layout_below="@id/page"
         android:layout_toEndOf="@id/icon_wrapper"
         android:layout_toLeftOf="@id/menu"
         android:layout_toRightOf="@id/icon_wrapper"
         android:layout_toStartOf="@id/menu"
         android:ellipsize="end"
         android:maxLines="3"
         android:paddingLeft="@dimen/activity_stream_base_margin"
         android:paddingStart="@dimen/activity_stream_base_margin"
-        android:paddingRight="0dp"
-        android:paddingEnd="0dp"
-        android:textAlignment="viewStart"
         android:textColor="#ff000000"
         android:textSize="14sp"
         android:textStyle="bold"
         tools:text="Descriptive title of a page that is veeeeeeery long - maybe even too long?" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_below="@id/page_title"
+        android:layout_below="@id/card_history_label"
         android:layout_toEndOf="@id/icon_wrapper"
         android:layout_toRightOf="@id/icon_wrapper"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/activity_stream_base_margin"
         android:paddingEnd="@dimen/activity_stream_base_margin"
         android:paddingLeft="@dimen/activity_stream_base_margin"
         android:paddingRight="@dimen/activity_stream_base_margin"
         android:paddingStart="@dimen/activity_stream_base_margin"
         android:paddingTop="4dp"
         tools:ignore="UseCompoundDrawables">
 
         <ImageView
-            android:id="@+id/page_source_icon"
+            android:id="@+id/source_icon"
             android:layout_width="12dp"
             android:layout_height="12dp"
             tools:src="@drawable/ic_as_bookmarked" />
 
-        <!-- See id/page_domain for textAlignment comment. -->
         <TextView
-            android:id="@+id/page_source"
+            android:id="@+id/card_history_source"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
             android:layout_marginLeft="2dp"
-            android:layout_marginRight="0dp"
-            android:layout_marginEnd="0dp"
             android:layout_weight="1"
-            android:textAlignment="viewStart"
             android:textColor="@color/activity_stream_subtitle"
             android:textSize="12sp"
             tools:text="Bookmarked" />
 
     </LinearLayout>
 </RelativeLayout>
--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WebpageItemRow.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/WebpageItemRow.java
@@ -26,37 +26,37 @@ import org.mozilla.gecko.util.ViewUtil;
 import java.lang.ref.WeakReference;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.UUID;
 
 public class WebpageItemRow extends StreamViewHolder {
     private static final String LOGTAG = "GeckoWebpageItemRow";
 
-    public static final int LAYOUT_ID = R.layout.activity_stream_webpage_item_row;
+    public static final int LAYOUT_ID = R.layout.activity_stream_card_history_item;
     private static final double SIZE_RATIO = 0.75;
 
     private WebpageRowModel webpageModel;
     private int position;
 
     private final StreamOverridablePageIconLayout pageIconLayout;
     private final TextView pageDomainView;
     private final TextView pageTitleView;
     private final ImageView pageSourceIconView;
     private final TextView pageSourceView;
     private final ImageView menuButton;
 
     public WebpageItemRow(final View itemView, final StreamHighlightItemRowContextMenuListener contextMenuListener) {
         super(itemView);
 
-        pageTitleView = (TextView) itemView.findViewById(R.id.page_title);
-        pageIconLayout = (StreamOverridablePageIconLayout) itemView.findViewById(R.id.page_icon);
-        pageSourceView = (TextView) itemView.findViewById(R.id.page_source);
-        pageDomainView = (TextView) itemView.findViewById(R.id.page_domain);
-        pageSourceIconView = (ImageView) itemView.findViewById(R.id.page_source_icon);
+        pageTitleView = (TextView) itemView.findViewById(R.id.card_history_label);
+        pageIconLayout = (StreamOverridablePageIconLayout) itemView.findViewById(R.id.icon);
+        pageSourceView = (TextView) itemView.findViewById(R.id.card_history_source);
+        pageDomainView = (TextView) itemView.findViewById(R.id.page);
+        pageSourceIconView = (ImageView) itemView.findViewById(R.id.source_icon);
 
         menuButton = (ImageView) itemView.findViewById(R.id.menu);
         menuButton.setImageDrawable(
                 DrawableUtil.tintDrawable(menuButton.getContext(), R.drawable.menu, Color.LTGRAY));
         TouchTargetUtil.ensureTargetHitArea(menuButton, itemView);
         ViewUtil.enableTouchRipple(menuButton);
         menuButton.setOnClickListener(new View.OnClickListener() {
             @Override