pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Removed test code for pp

Browse source
This commit is contained in:
Александр Зацепин 2019-02-05 11:31:10 +03:00 • committed by yoksnod
parent 664f9b3365
commit ff66154204
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/src/com/mapswithme/maps/widget/placepage/BannerController.java
View file

@ -114,7 +114,7 @@ final class BannerController
@NonNull
private final AdsRemovalPurchaseControllerProvider mAdsRemovalProvider;
private int mClosedHeight;
private int mOpentHeight;
private int mOpenedHeight;
@NonNull
private final BannerDetailsRequester mBannerDetailsRequester;
@ -131,7 +131,7 @@ final class BannerController
mAdTracker = tracker;
Resources resources = mBannerView.getResources();
mClosedHeight = resources.getDimensionPixelSize(R.dimen.placepage_banner_small_height);
mOpentHeight = resources.getDimensionPixelSize(R.dimen.placepage_banner_large_height);
mOpenedHeight = resources.getDimensionPixelSize(R.dimen.placepage_banner_large_height);
mAdsRemovalProvider = adsRemovalProvider;
mBannerDetailsRequester = bannerDetailsRequester;
initBannerViews();
@ -276,16 +276,15 @@ final class BannerController
{
ViewGroup banner = mContainerView.findViewById(R.id.banner);
ViewGroup.LayoutParams lp = banner.getLayoutParams();
lp.height = (int) ((mOpentHeight - mClosedHeight) * ratio + mClosedHeight);
lp.height = (int) ((mOpenedHeight - mClosedHeight) * ratio + mClosedHeight);
banner.setLayoutParams(lp);
}
void zoomOut(float ratio)
{
ViewGroup banner = mContainerView.findViewById(R.id.banner);
ViewGroup.LayoutParams lp = banner.getLayoutParams();
lp.height = (int) (mClosedHeight - (mClosedHeight - mOpentHeight) * ratio);
lp.height = (int) (mClosedHeight - (mClosedHeight - mOpenedHeight) * ratio);
banner.setLayoutParams(lp);
}

6
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -25,7 +25,6 @@ import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.text.util.Linkify;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -235,6 +234,7 @@ public class PlacePageView extends NestedScrollView
private int mStorageCallbackSlot;
@Nullable
private CountryItem mCurrentCountry;
private boolean mScrollable = true;
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback()
{
@ -305,8 +305,6 @@ public class PlacePageView extends NestedScrollView
}
};
private boolean mScrollable = true;
void setScrollable(boolean scrollable)
{
mScrollable = scrollable;
@ -318,7 +316,6 @@ public class PlacePageView extends NestedScrollView
switch (ev.getAction())
{
case MotionEvent.ACTION_DOWN:
Log.d("XXX", "onTouchEvent mScrollable = " + mScrollable);
return mScrollable && super.onTouchEvent(ev);
default:
return super.onTouchEvent(ev);
@ -328,7 +325,6 @@ public class PlacePageView extends NestedScrollView
@Override
public boolean onInterceptTouchEvent(MotionEvent event)
{
Log.d("XXX", "onInterceptTouchEvent mScrollable = " + mScrollable);
return mScrollable && super.onInterceptTouchEvent(event);
}