Merge branch 'dev' into feature/stackview

This commit is contained in:
2018-02-04 09:52:16 -06:00
29 changed files with 381 additions and 92 deletions

View File

@@ -19,6 +19,11 @@ android {
}
}
buildToolsVersion '26.0.2'
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
}
dependencies {

View File

@@ -63,6 +63,7 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
private static final int PULSE_ANIMATOR_DELAY = 300;
private OnTimeSetListener mCallback;
private DialogInterface.OnDismissListener dismissListener;
private HapticFeedbackController mHapticFeedbackController;
@@ -116,7 +117,7 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
*/
void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute);
void onTimeCleared(RadialPickerLayout view);
default void onTimeCleared(RadialPickerLayout view) {}
}
public TimePickerDialog() {
@@ -998,4 +999,15 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
return false;
}
}
public void setDismissListener( DialogInterface.OnDismissListener listener ) {
dismissListener = listener;
}
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
if( dismissListener != null )
dismissListener.onDismiss(dialog);
}
}