Merge branch 'develop' into feature/update-to-gradle-2.4

wordpress-mobile · Aug 25, 2015 · cfe353e · cfe353e
2 parents 3ff99e3 + fc2bc73
commit cfe353e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/WordPressUtils/build.gradle b/WordPressUtils/build.gradle
@@ -24,13 +24,13 @@ dependencies {
 android {
     publishNonDefault true
 
-    compileSdkVersion 19
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
 
     defaultConfig {
         versionName "1.5.0"
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 22
     }
 }
 

diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java
@@ -38,6 +38,12 @@ public static int getDisplayPixelHeight(Context context) {
         return (size.y);
     }
 
+    public static float spToPx(Context context, float sp){
+        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        final float scale = displayMetrics.scaledDensity;
+        return sp * scale;
+    }
+
     public static int dpToPx(Context context, int dp) {
         float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
                 context.getResources().getDisplayMetrics());