Kaynağa Gözat

Merge remote-tracking branch 'origin/master'

Aidan Follestad 10 yıl önce
ebeveyn
işleme
ce054e9bac

+ 1 - 1
build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.0.1'
         classpath 'com.novoda:bintray-release:0.2.5'
     }
 }

+ 6 - 3
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -174,11 +174,14 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
                 else
                     paddingBottom = r.getDimensionPixelSize(R.dimen.md_dialog_frame_margin);
 
-                sv.setPadding(frameMargin, paddingTop, frameMargin, paddingBottom);
+                sv.setPadding(0, paddingTop, 0, paddingBottom);
                 sv.setClipToPadding(false);
-                sv.addView(innerView,
+
+                ScrollView.LayoutParams innerViewLayoutParams=
                         new ScrollView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                ViewGroup.LayoutParams.WRAP_CONTENT));
+                                ViewGroup.LayoutParams.WRAP_CONTENT);
+                innerViewLayoutParams.setMargins(frameMargin, 0, frameMargin, 0);
+                sv.addView(innerView, innerViewLayoutParams);
 
                 innerView = sv;
             }