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

Merge branch 'android_apps' of ssh://sapsailing.com/home/trac/git into android_apps

Browse Source
This commit is contained in:
Lukas Zielinski committed 2014-11-18 12:27:56 +01:00
2 parents 075054e3b1 96f0635e69
commit 9a66ae9479
4 files changed
+29 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.shared/res/menu/options_menu_live_status.xml
+9 -5
View File
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/options_menu_live"
android:icon="@drawable/ic_menu_share_local"
android:title="@string/options_menu_live"
android:showAsAction="ifRoom" />
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/options_menu_live"
android:icon="@drawable/ic_menu_share_local"
android:title="@string/options_menu_live"
app:showAsAction="ifRoom"/>
</menu>
mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/BaseActivity.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.sap.sailing.android.shared.ui.activities;
import android.support.v4.app.FragmentActivity;
import android.support.v7.app.ActionBarActivity;
public abstract class BaseActivity extends FragmentActivity {
public abstract class BaseActivity extends ActionBarActivity {
private static final String TAG = BaseActivity.class.getName();
}
mobile/com.sap.sailing.android.tracking.app/res/menu/options_menu.xml
+14 -9
View File
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/options_menu_settings"
android:icon="@drawable/settings_grey"
android:title="@string/options_menu_settings"
android:showAsAction="" />
<item android:id="@+id/options_menu_info"
android:icon="@drawable/ic_menu_info_details"
android:title="@string/options_menu_info"
android:showAsAction="" />
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/options_menu_settings"
android:icon="@drawable/settings_grey"
android:title="@string/options_menu_settings"
app:showAsAction=""/>
<item
android:id="@+id/options_menu_info"
android:icon="@drawable/ic_menu_info_details"
android:title="@string/options_menu_info"
app:showAsAction=""/>
</menu>
mobile/com.sap.sailing.android.tracking.app/res/menu/regatta.xml
+4 -3
View File
@@ -1,11 +1,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="com.sap.sailing.android.tracking.app.RegattaActivity" >
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
android:title="@string/action_settings"
app:showAsAction="never"/>
</menu>
</menu>