Backed out changeset 501e46e3e348 (bug 1137483)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 08 May 2015 10:48:19 +0200
changeset 242809 c3fe4dd112b267c8acb28b8fc07b7f421af8e891
parent 242808 638037d979da09fa48e0adf1a57d3a278950e984
child 242810 e32bd51ba9ea2accb8917500b1f1176a99ee7fca
push id28712
push usercbook@mozilla.com
push dateFri, 08 May 2015 08:50:12 +0000
treeherdermozilla-central@86203ac87a08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1137483
milestone40.0a1
backs out501e46e3e348fdf8e503f330d40d538456d10544
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 changeset 501e46e3e348 (bug 1137483)
mobile/android/base/home/SearchEngineBar.java
mobile/android/base/resources/layout/search_engine_bar_item.xml
--- a/mobile/android/base/home/SearchEngineBar.java
+++ b/mobile/android/base/home/SearchEngineBar.java
@@ -93,20 +93,16 @@ public class SearchEngineBar extends Two
             } else {
                 view = convertView;
             }
 
             final FaviconView faviconView = (FaviconView) view.findViewById(R.id.search_engine_icon);
             final SearchEngine searchEngine = searchEngines.get(position);
             faviconView.updateAndScaleImage(searchEngine.getIcon(), searchEngine.getEngineIdentifier());
 
-            final View container = view.findViewById(R.id.search_engine_icon_container);
-            final String desc = getResources().getString(R.string.search_bar_item_desc, searchEngine.getEngineIdentifier());
-            container.setContentDescription(desc);
-
             return view;
         }
     }
 
     /**
      * A Container to surround the SearchEngineBar. This is necessary so we can draw
      * a divider across the entire width of the screen, but have the inner list layout
      * not take up the full width of the screen so it can be centered within this container
--- a/mobile/android/base/resources/layout/search_engine_bar_item.xml
+++ b/mobile/android/base/resources/layout/search_engine_bar_item.xml
@@ -6,17 +6,16 @@
 <!-- TwoWayView doesn't let us set the margin around items (except as
      gecko:itemMargin, but that doesn't increase the hit area) so we
      have to surround the main View by a ViewGroup to create a pressable margin.
 
      Note: the layout_height values are shared with the parent
      View (browser_search at the time of this writing). -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search_engine_icon_container"
     android:layout_height="match_parent"
     android:layout_width="72dp"
     android:background="@color/pressed_about_page_header_grey">
 
     <!-- Width & height are set to make the Favicons as sharp as possible
          based on asset size. -->
     <org.mozilla.gecko.widget.FaviconView
         android:id="@+id/search_engine_icon"