eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 22:37:15 +00:00
Code Activity

Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3204'

Browse Source
This commit is contained in:
Axel Uhl committed 2015-08-13 15:41:24 +02:00
2 parents 15dce614f1 957fe53224
commit edd86f0f74
1 file changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
+9 -7
View File
@@ -6,6 +6,7 @@ import java.util.Date;
import java.util.List;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.util.SparseBooleanArray;
@@ -105,14 +106,15 @@ public class ProtestTimeDialogFragment extends AttachedDialogFragment {
timePicker = (TimePicker) view.findViewById(R.id.protest_time_time_time_picker);
setupTimePicker(timePicker);
ViewGroup.LayoutParams layoutParams = racesList.getLayoutParams();
layoutParams.height = 49 * races.size();
int screenHeight = (int)(ScreenHelper.on(getActivity()).getScreenHeight() * 0.65);
if (layoutParams.height > screenHeight) {
layoutParams.height = screenHeight;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// TODO: @Samuel -> please check, why we did this, because I can't remember
ViewGroup.LayoutParams layoutParams = racesList.getLayoutParams();
layoutParams.height = 49 * races.size();
int screenHeight = (int)(ScreenHelper.on(getActivity()).getScreenHeight() * 0.65);
if (layoutParams.height > screenHeight) {
layoutParams.height = screenHeight;
}
}
view.setLayoutParams(layoutParams);
return view;
}