eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-27 07:56:38 +00:00
Code Activity

Merge remote-tracking branch 'origin/ubilabs--rcapp--master' into android-maven-build-bug3190

Browse Source
This commit is contained in:
Steffen Schaefer
2015-09-15 10:12:42 +02:00
parent e600600b66 5247877986
commit eaf01ab06f
326 changed files with 5646 additions and 2014 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.tracking.app/.classpath
+10 -11
View File
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.domain.common"/>
<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.domain"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.domain.common"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
+4 -13
View File
@@ -1,6 +1,6 @@
package com.sap.sailing.android.tracking.app.ui.fragments;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
@@ -9,6 +9,7 @@ import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.MediaStore;
import android.view.LayoutInflater;
@@ -81,15 +82,6 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
}
}
private void checkAndSwitchToThankYouScreenIfRegattaOver() {
RegattaActivity regattaActivity = (RegattaActivity) getActivity();
long regattaEnd = regattaActivity.event.endMillis;
if (System.currentTimeMillis() > regattaEnd) {
switchToThankYouScreen();
}
}
/**
* If the regatta started, don't display the countdown any more.
*/
@@ -115,7 +107,7 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
}
@SuppressWarnings("deprecation")
@SuppressLint("NewApi")
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void switchToThankYouScreen() {
showingThankYouNote = true;
@@ -124,7 +116,7 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
Button startTrackingButton = (Button) getActivity().findViewById(R.id.start_tracking);
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
startTrackingButton.setBackgroundDrawable(getResources().getDrawable(R.drawable.rounded_btn_yellow));
} else {
startTrackingButton.setBackground(getResources().getDrawable(R.drawable.rounded_btn_yellow));
@@ -147,7 +139,6 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
}
timer = new TimerRunnable();
timer.start();
checkAndSwitchToThankYouScreenIfRegattaOver();
checkAndHideCountdownIfRegattaIsInProgress();
}