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

Better tablet check logic.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-12-11 14:37:13 +03:00 • committed by Alex Zolotarev
parent a7b26b6348
commit 58bbb12f0f
4 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/values-sw600dp/dimens.xml
View file

@ -28,4 +28,6 @@
<dimen name="bottom_button_width">46dp</dimen>
<dimen name="bottom_item_height">56dp</dimen>
<bool name="isTablet">true</bool>
</resources>

2
android/res/values/dimens.xml
View file

@ -74,4 +74,6 @@
<dimen name="routing_progress_size">32dp</dimen>
<dimen name="panel_width">400dp</dimen>
<bool name="isTablet">false</bool>
</resources>

3
android/src/com/mapswithme/maps/MWMApplication.java
View file

@ -19,7 +19,6 @@ import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.util.Constants;
import com.mapswithme.util.FbUtil;
import com.mapswithme.util.Utils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.StubLogger;
import com.mapswithme.util.statistics.Statistics;
@ -107,7 +106,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou
// init native framework
nativeInit(getApkPath(), extStoragePath, extTmpPath,
getOBBGooglePath(), BuildConfig.FLAVOR, BuildConfig.IS_PRO, mIsYota, UiUtils.isTablet());
getOBBGooglePath(), BuildConfig.FLAVOR, BuildConfig.IS_PRO, mIsYota, getResources().getBoolean(R.bool.isTablet));
ActiveCountryTree.addListener(this);

11
android/src/com/mapswithme/util/UiUtils.java
View file

@ -439,17 +439,6 @@ public final class UiUtils
.show();
}
/**
*
* @return whether device is a tablet with 600dp+ minimum width
*/
public static boolean isTablet()
{
final DisplayMetrics metrics = MWMApplication.get().getResources().getDisplayMetrics();
final float minLength = metrics.density * 600;
return metrics.widthPixels > minLength || metrics.heightPixels > minLength;
}
// utility class
private UiUtils()
{}