eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-19 04:05:36 +00:00
Code Activity

fixed auto return of additional race options (tablet only)

Browse Source
This commit is contained in:
Peter Siegmund
2016-02-23 15:12:38 +01:00
parent 958dce9882
commit 0ec914ef0a
3 changed files with 6 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_procedure_pathfinder_xlarge.xml
-38
View File
@@ -4,43 +4,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="@dimen/selector_header_height"
android:background="?attr/sap_gray">
<LinearLayout
android:id="@+id/header_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:orientation="horizontal">
<ImageView
android:id="@+id/header_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="?attr/chevron_left_24dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gate_start_pathfinder"
android:textAppearance="?attr/textNormal" />
</LinearLayout>
</RelativeLayout>
<View
android:id="@+id/line_top"
android:layout_width="match_parent"
android:layout_height="@dimen/thick_line"
android:layout_below="@id/header"
android:background="?attr/black" />
<RelativeLayout
android:id="@+id/path_finder"
android:layout_width="match_parent"
@@ -64,7 +27,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/path_finder"
android:layout_below="@id/line_top"
android:background="?attr/sap_gray_black_30">
<LinearLayout
mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_procedure_timing_xlarge.xml
-38
View File
@@ -4,43 +4,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="@dimen/selector_header_height"
android:background="?attr/sap_gray">
<LinearLayout
android:id="@+id/header_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:orientation="horizontal">
<ImageView
android:id="@+id/header_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="?attr/chevron_left_24dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gate_start_timing"
android:textAppearance="?attr/textNormal" />
</LinearLayout>
</RelativeLayout>
<View
android:id="@+id/line_top"
android:layout_width="match_parent"
android:layout_height="@dimen/thick_line"
android:layout_below="@id/header"
android:background="?attr/black" />
<RelativeLayout
android:id="@+id/gate_button_layout"
android:layout_width="match_parent"
@@ -63,7 +26,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/gate_button_layout"
android:layout_below="@id/line_top"
android:background="?attr/sap_gray_black_30">
<LinearLayout
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java
+6
View File
@@ -592,6 +592,12 @@ public class SetupPanelFragment extends BasePanelFragment {
String data = intent.getExtras().getString(AppConstants.INTENT_ACTION_EXTRA);
if (AppConstants.INTENT_ACTION_TOGGLE_PROCEDURE.equals(data)) {
uncheckMarker(mButtonProcedure);
} else if (AppConstants.INTENT_ACTION_TOGGLE_PROCEDURE_MORE_MODE.equals(data)) {
uncheckMarker(mButtonMode);
} else if (AppConstants.INTENT_ACTION_TOGGLE_PROCEDURE_MORE_PATHFINDER.equals(data)) {
uncheckMarker(mButtonPathfinder);
} else if (AppConstants.INTENT_ACTION_TOGGLE_PROCEDURE_MORE_TIMING.equals(data)) {
uncheckMarker(mButtonTiming);
} else if (AppConstants.INTENT_ACTION_TOGGLE_COURSE.equals(data)) {
uncheckMarker(mButtonCourse);
} else if (AppConstants.INTENT_ACTION_TOGGLE_WIND.equals(data)) {