From 78fb60203386eb2916b2fc05b22d4bde2e0604a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Mon, 31 Jul 2017 20:02:12 +0300 Subject: [PATCH] [android] Fixed android build after string merge --- android/res/layout/card_loading.xml | 2 +- .../src/com/mapswithme/maps/base/BaseSponsoredAdapter.java | 2 +- android/src/com/mapswithme/maps/cian/CianAdapter.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/res/layout/card_loading.xml b/android/res/layout/card_loading.xml index 3829d57b3c..e79205530b 100644 --- a/android/res/layout/card_loading.xml +++ b/android/res/layout/card_loading.xml @@ -44,6 +44,6 @@ android:fontFamily="@string/robotoMedium" android:gravity="center" android:background="?windowBackgroundForced" - android:text="@string/details" + android:text="@string/preloader_cian_button" tools:targetApi="jelly_bean"/> diff --git a/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java b/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java index a157e3f00d..304104808d 100644 --- a/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java +++ b/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java @@ -36,7 +36,7 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter