From 8e27d72dbdb3972bec2129684121c3dd6336c2cc Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Mon, 14 Dec 2015 20:11:22 +0300
Subject: [PATCH] [android] Static showcase menu text. (cherry picked from
 commit f575fbe)

---
 android/res/layout/menu_content.xml           |  1 +
 android/res/layout/menu_content_grid.xml      |  1 +
 .../src/com/mapswithme/maps/MwmActivity.java  |  2 --
 .../mapswithme/maps/widget/menu/MainMenu.java | 23 ++++---------------
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/android/res/layout/menu_content.xml b/android/res/layout/menu_content.xml
index cf40f31918..5a94bb86c0 100644
--- a/android/res/layout/menu_content.xml
+++ b/android/res/layout/menu_content.xml
@@ -53,6 +53,7 @@
     style="@style/MwmTheme.Menu.Content.ListItem"
     android:drawableLeft="@drawable/ic_showcase"
     android:visibility="gone"
+    android:text="@string/showcase_more_apps"
     tools:visibility="visible"
     tools:background="#20FF0000"/>
 
diff --git a/android/res/layout/menu_content_grid.xml b/android/res/layout/menu_content_grid.xml
index a43ccdc2ba..91dbb0a62a 100644
--- a/android/res/layout/menu_content_grid.xml
+++ b/android/res/layout/menu_content_grid.xml
@@ -55,6 +55,7 @@
     style="@style/MwmTheme.Menu.Content.GridItem.Text"
     android:drawableTop="@drawable/ic_showcase"
     android:visibility="gone"
+    android:text="@string/showcase_more_apps"
     tools:background="#200000FF"
     tools:visibility="visible"/>
 
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index a58899e8a2..74539a2e01 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -748,8 +748,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
         final NativeAppwallBanner menuBanner = nativeAppwallAd.getBanners().get(0);
         mMainMenu.showShowcase(true);
-        mMainMenu.setShowcaseText(menuBanner.getTitle());
-        mMainMenu.setShowcaseDrawable(menuBanner.getIcon().getBitmap());
       }
 
       @Override
diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
index 7276f0d920..487a2673b5 100644
--- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
+++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java
@@ -2,7 +2,6 @@ package com.mapswithme.maps.widget.menu;
 
 import android.animation.Animator;
 import android.app.Activity;
-import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
@@ -14,6 +13,11 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import com.mapswithme.country.ActiveCountryTree;
 import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.MwmActivity;
@@ -24,11 +28,6 @@ import com.mapswithme.maps.widget.RotateByAlphaDrawable;
 import com.mapswithme.maps.widget.TrackedTransitionDrawable;
 import com.mapswithme.util.UiUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class MainMenu
 {
   public enum State
@@ -545,18 +544,6 @@ public class MainMenu
     UiUtils.showIf(show, mItemViews.get(Item.SHOWCASE));
   }
 
-  public void setShowcaseText(String text)
-  {
-    ((TextView)mItemViews.get(Item.SHOWCASE)).setText(text);
-  }
-
-  public void setShowcaseDrawable(Bitmap bitmap)
-  {
-    // TODO d.yunitsky uncomment or delete in future, when decision with dynamic vs static icons will be made
-//    final Drawable drawable = new BitmapDrawable(mFrame.getResources(), Bitmap.createScaledBitmap(bitmap, UiUtils.dp(48), UiUtils.dp(48), true));
-//    ((TextView) mItemViews.get(Item.SHOWCASE)).setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
-  }
-
   public Button getRouteStartButton()
   {
     return mRouteStartButton;