Bug 1130203 - Remove Firefox logo from share overlay. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 25 Feb 2015 17:10:17 -0800
changeset 264363 b29f773bd048f64662701f791c88b8076540c028
parent 264362 9a2166dd61dc9bf3f97f519295c52d2a6ebbdcc7
child 264364 ba4e9c9171996dadc76d330d01588863ba54bc0c
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1130203
milestone39.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 1130203 - Remove Firefox logo from share overlay. r=mhaigh
mobile/android/base/overlays/ui/ShareDialog.java
mobile/android/base/resources/layout/overlay_share_dialog.xml
--- a/mobile/android/base/overlays/ui/ShareDialog.java
+++ b/mobile/android/base/overlays/ui/ShareDialog.java
@@ -258,41 +258,38 @@ public class ShareDialog extends Locales
         // be, since it's a URL).
         final TextView subtitleView = (TextView) findViewById(R.id.subtitle);
         subtitleView.setText(pageUrl);
         subtitleView.setEllipsize(TextUtils.TruncateAt.MARQUEE);
         subtitleView.setSingleLine(true);
         subtitleView.setMarqueeRepeatLimit(5);
         subtitleView.setSelected(true);
 
-        final ImageView foxIcon = (ImageView) findViewById(R.id.share_overlay_icon);
         final View titleView = findViewById(R.id.title);
 
         if (state == State.DEVICES_ONLY) {
             bookmarkButton.setVisibility(View.GONE);
             readingListButton.setVisibility(View.GONE);
 
-            foxIcon.setOnClickListener(null);
             titleView.setOnClickListener(null);
             subtitleView.setOnClickListener(null);
             return;
         }
 
         bookmarkButton.setVisibility(View.VISIBLE);
         readingListButton.setVisibility(View.VISIBLE);
 
         // Configure buttons.
         final View.OnClickListener launchBrowser = new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 ShareDialog.this.launchBrowser();
             }
         };
 
-        foxIcon.setOnClickListener(launchBrowser);
         titleView.setOnClickListener(launchBrowser);
         subtitleView.setOnClickListener(launchBrowser);
 
         final LocalBrowserDB browserDB = new LocalBrowserDB(getCurrentProfile());
         setButtonState(url, browserDB);
 
         // Start the slide-up animation.
         final Animation anim = AnimationUtils.loadAnimation(this, R.anim.overlay_slide_up);
--- a/mobile/android/base/resources/layout/overlay_share_dialog.xml
+++ b/mobile/android/base/resources/layout/overlay_share_dialog.xml
@@ -6,17 +6,16 @@
 
 <!-- Serves to position the content on the screen (bottom, centered) and provide the drop-shadow -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/sharedialog"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_marginLeft="15dp"
     android:layout_marginRight="15dp"
-    android:paddingTop="30dp"
     android:clipChildren="false"
     android:clipToPadding="false">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center"
         android:paddingTop="8dp"
@@ -79,18 +78,9 @@
             <org.mozilla.gecko.overlays.ui.OverlayDialogButton
                 style="@style/ShareOverlayButton.Text.Container"
                 android:id="@+id/overlay_share_bookmark_btn"
                 android:enabled="false"/>
 
         </LinearLayout>
     </LinearLayout>
 
-    <!-- Firefox logo (has to appear higher in the z-order than the content. -->
-    <ImageView
-        android:id="@+id/share_overlay_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|center"
-        android:scaleType="center"
-        android:src="@drawable/icon"
-        android:layout_marginBottom="-6dp"/>
 </FrameLayout>