Merge pull request #131 from pattM/layout_inflater_fix

Use LayoutInflater from Builder in Time/DatePickerDialogFragment.
avast · Jan 12, 2016 · de3e96a · de3e96a
2 parents 25d866e + 9110a82
commit de3e96a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/library/src/main/java/com/avast/android/dialogs/fragment/DatePickerDialogFragment.java b/library/src/main/java/com/avast/android/dialogs/fragment/DatePickerDialogFragment.java
@@ -5,7 +5,6 @@
 import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.DatePicker;
 
@@ -87,7 +86,7 @@ public void onClick(View view) {
                 }
             });
         }
-        mDatePicker = (DatePicker) LayoutInflater.from(getActivity()).inflate(R.layout.sdl_datepicker, null);
+        mDatePicker = (DatePicker) builder.getLayoutInflater().inflate(R.layout.sdl_datepicker, null);
         builder.setView(mDatePicker);
 
         TimeZone zone = TimeZone.getTimeZone(getArguments().getString(ARG_ZONE));

diff --git a/library/src/main/java/com/avast/android/dialogs/fragment/TimePickerDialogFragment.java b/library/src/main/java/com/avast/android/dialogs/fragment/TimePickerDialogFragment.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.support.v4.app.FragmentManager;
-import android.view.LayoutInflater;
 import android.widget.TimePicker;
 
 import com.avast.android.dialogs.R;
@@ -31,7 +30,7 @@ public static SimpleDialogBuilder createBuilder(Context context, FragmentManager
     @Override
     protected BaseDialogFragment.Builder build(BaseDialogFragment.Builder builder) {
         builder = super.build(builder);
-        mTimePicker = (TimePicker) LayoutInflater.from(getActivity()).inflate(R.layout.sdl_timepicker, null);
+        mTimePicker = (TimePicker) builder.getLayoutInflater().inflate(R.layout.sdl_timepicker, null);
         mTimePicker.setIs24HourView(getArguments().getBoolean(ARG_24H));
         builder.setView(mTimePicker);