Used Android Studio Refactor tool to convert to AppCompat (had to change some references back to just Activity to get it to compile
This commit is contained in:
@@ -18,8 +18,6 @@
|
|||||||
package com.rohitss.uceh;
|
package com.rohitss.uceh;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
import android.annotation.SuppressLint;
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.content.ClipData;
|
import android.content.ClipData;
|
||||||
import android.content.ClipboardManager;
|
import android.content.ClipboardManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -28,7 +26,6 @@ import android.content.Intent;
|
|||||||
import android.content.pm.ApplicationInfo;
|
import android.content.pm.ApplicationInfo;
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
@@ -39,6 +36,9 @@ import android.view.View;
|
|||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AlertDialog;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -54,7 +54,7 @@ import uk.org.openseizuredetector.R;
|
|||||||
* <p>This class is used to </p>
|
* <p>This class is used to </p>
|
||||||
* Created by Rohit.
|
* Created by Rohit.
|
||||||
*/
|
*/
|
||||||
public final class UCEDefaultActivity extends Activity {
|
public final class UCEDefaultActivity extends AppCompatActivity {
|
||||||
private File txtFile;
|
private File txtFile;
|
||||||
private String strCurrentErrorLog;
|
private String strCurrentErrorLog;
|
||||||
private String TAG = "UCEDefaultActivity";
|
private String TAG = "UCEDefaultActivity";
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ import android.content.Intent;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.lang.ref.WeakReference;
|
import java.lang.ref.WeakReference;
|
||||||
@@ -228,7 +230,7 @@ public final class UCEHandler {
|
|||||||
return context.getSharedPreferences(SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE).getLong(SHARED_PREFERENCES_FIELD_TIMESTAMP, -1);
|
return context.getSharedPreferences(SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE).getLong(SHARED_PREFERENCES_FIELD_TIMESTAMP, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void closeApplication(Activity activity) {
|
static void closeApplication(AppCompatActivity activity) {
|
||||||
activity.finish();
|
activity.finish();
|
||||||
killCurrentProcess();
|
killCurrentProcess();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ package uk.org.openseizuredetector;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
import static androidx.core.content.PermissionChecker.PERMISSION_GRANTED;
|
||||||
|
|
||||||
import android.Manifest;
|
import android.Manifest;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.ListActivity;
|
import android.app.ListActivity;
|
||||||
@@ -33,8 +35,6 @@ import android.content.pm.PackageManager;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import androidx.core.app.ActivityCompat;
|
|
||||||
import androidx.core.content.ContextCompat;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
@@ -47,9 +47,12 @@ import android.widget.ListView;
|
|||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.app.ActivityCompat;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
import androidx.core.view.MenuItemCompat;
|
||||||
|
|
||||||
import static androidx.core.content.PermissionChecker.PERMISSION_GRANTED;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Activity for scanning and displaying available Bluetooth LE devices.
|
* Activity for scanning and displaying available Bluetooth LE devices.
|
||||||
@@ -116,7 +119,7 @@ public class BLEScanActivity extends ListActivity {
|
|||||||
if (!mScanning) {
|
if (!mScanning) {
|
||||||
menu.findItem(R.id.menu_stop).setVisible(false);
|
menu.findItem(R.id.menu_stop).setVisible(false);
|
||||||
menu.findItem(R.id.menu_scan).setVisible(true);
|
menu.findItem(R.id.menu_scan).setVisible(true);
|
||||||
menu.findItem(R.id.menu_refresh).setActionView(null);
|
MenuItemCompat.setActionView(menu.findItem(R.id.menu_refresh), null);
|
||||||
} else {
|
} else {
|
||||||
menu.findItem(R.id.menu_stop).setVisible(true);
|
menu.findItem(R.id.menu_stop).setVisible(true);
|
||||||
menu.findItem(R.id.menu_scan).setVisible(false);
|
menu.findItem(R.id.menu_scan).setVisible(false);
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
package uk.org.openseizuredetector;
|
package uk.org.openseizuredetector;
|
||||||
|
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
@@ -37,25 +36,20 @@ import android.os.Handler;
|
|||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.os.Messenger;
|
import android.os.Messenger;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import androidx.core.view.MenuCompat;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewConfiguration;
|
import android.view.ViewConfiguration;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
|
import android.widget.Button;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Button;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import java.text.DecimalFormat;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import java.util.ArrayList;
|
import androidx.core.view.MenuCompat;
|
||||||
import java.util.Timer;
|
|
||||||
import java.util.TimerTask;
|
|
||||||
|
|
||||||
//MPAndroidChart
|
|
||||||
import com.github.mikephil.charting.charts.BarChart;
|
import com.github.mikephil.charting.charts.BarChart;
|
||||||
import com.github.mikephil.charting.components.XAxis;
|
import com.github.mikephil.charting.components.XAxis;
|
||||||
import com.github.mikephil.charting.components.YAxis;
|
import com.github.mikephil.charting.components.YAxis;
|
||||||
@@ -65,6 +59,14 @@ import com.github.mikephil.charting.data.BarEntry;
|
|||||||
import com.github.mikephil.charting.utils.ValueFormatter;
|
import com.github.mikephil.charting.utils.ValueFormatter;
|
||||||
import com.rohitss.uceh.UCEHandler;
|
import com.rohitss.uceh.UCEHandler;
|
||||||
|
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.text.DecimalFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Timer;
|
||||||
|
import java.util.TimerTask;
|
||||||
|
|
||||||
|
//MPAndroidChart
|
||||||
|
|
||||||
public class MainActivity extends AppCompatActivity {
|
public class MainActivity extends AppCompatActivity {
|
||||||
static final String TAG = "MainActivity";
|
static final String TAG = "MainActivity";
|
||||||
private int okColour = Color.BLUE;
|
private int okColour = Color.BLUE;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package uk.org.openseizuredetector;
|
package uk.org.openseizuredetector;
|
||||||
|
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
@@ -11,7 +10,8 @@ import android.os.Environment;
|
|||||||
import android.os.Looper;
|
import android.os.Looper;
|
||||||
import android.os.StatFs;
|
import android.os.StatFs;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.WindowManager;
|
|
||||||
|
import androidx.appcompat.app.AlertDialog;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
|
|||||||
@@ -45,12 +45,14 @@ import android.os.Build;
|
|||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import androidx.core.app.ActivityCompat;
|
|
||||||
import androidx.core.content.ContextCompat;
|
|
||||||
import android.text.format.Time;
|
import android.text.format.Time;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.app.ActivityCompat;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
import org.apache.http.conn.util.InetAddressUtils;
|
import org.apache.http.conn.util.InetAddressUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -488,7 +490,7 @@ public class OsdUtil implements ActivityCompat.OnRequestPermissionsResultCallbac
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void requestPermissions(Activity activity) {
|
public void requestPermissions(AppCompatActivity activity) {
|
||||||
if (mPermissionsRequested) {
|
if (mPermissionsRequested) {
|
||||||
Log.i(TAG, "requestPermissions() - request already sent - not doing anything");
|
Log.i(TAG, "requestPermissions() - request already sent - not doing anything");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -26,11 +26,7 @@
|
|||||||
|
|
||||||
package uk.org.openseizuredetector;
|
package uk.org.openseizuredetector;
|
||||||
|
|
||||||
import java.text.DecimalFormat;
|
|
||||||
import java.text.NumberFormat;
|
|
||||||
|
|
||||||
import android.app.ActivityManager;
|
import android.app.ActivityManager;
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.app.Notification;
|
import android.app.Notification;
|
||||||
import android.app.NotificationChannel;
|
import android.app.NotificationChannel;
|
||||||
import android.app.NotificationManager;
|
import android.app.NotificationManager;
|
||||||
@@ -49,24 +45,21 @@ import android.media.ToneGenerator;
|
|||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
import android.net.NetworkInfo;
|
import android.net.NetworkInfo;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
import android.os.Binder;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.CountDownTimer;
|
import android.os.CountDownTimer;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.HandlerThread;
|
import android.os.HandlerThread;
|
||||||
import android.os.Binder;
|
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.os.PowerManager;
|
import android.os.PowerManager;
|
||||||
import android.os.PowerManager.WakeLock;
|
import android.os.PowerManager.WakeLock;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
import androidx.core.app.NotificationCompat;
|
|
||||||
import android.telephony.SmsManager;
|
import android.telephony.SmsManager;
|
||||||
|
import android.text.format.Time;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import java.util.Timer;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import java.io.*;
|
import androidx.core.app.NotificationCompat;
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
import android.text.format.Time;
|
|
||||||
|
|
||||||
import com.rohitss.uceh.UCEHandler;
|
import com.rohitss.uceh.UCEHandler;
|
||||||
|
|
||||||
@@ -74,6 +67,12 @@ import org.json.JSONArray;
|
|||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.text.DecimalFormat;
|
||||||
|
import java.text.NumberFormat;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Timer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Based on example at:
|
* Based on example at:
|
||||||
* http://stackoverflow.com/questions/14309256/using-nanohttpd-in-android
|
* http://stackoverflow.com/questions/14309256/using-nanohttpd-in-android
|
||||||
|
|||||||
@@ -24,8 +24,6 @@
|
|||||||
*/
|
*/
|
||||||
package uk.org.openseizuredetector;
|
package uk.org.openseizuredetector;
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.AlertDialog;
|
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
@@ -46,6 +44,9 @@ import android.widget.Button;
|
|||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AlertDialog;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import com.rohitss.uceh.UCEHandler;
|
import com.rohitss.uceh.UCEHandler;
|
||||||
|
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
@@ -56,7 +57,7 @@ import java.util.TimerTask;
|
|||||||
* for it to start and to receive data and settings from the seizure detector before exiting and
|
* for it to start and to receive data and settings from the seizure detector before exiting and
|
||||||
* starting the main activity.
|
* starting the main activity.
|
||||||
*/
|
*/
|
||||||
public class StartupActivity extends Activity {
|
public class StartupActivity extends AppCompatActivity {
|
||||||
private static String TAG = "StartupActivity";
|
private static String TAG = "StartupActivity";
|
||||||
private int okColour = Color.BLUE;
|
private int okColour = Color.BLUE;
|
||||||
private int warnColour = Color.MAGENTA;
|
private int warnColour = Color.MAGENTA;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
@@ -15,7 +16,7 @@
|
|||||||
android:background="#FFFFFF"
|
android:background="#FFFFFF"
|
||||||
android:contentDescription="@string/app_name"
|
android:contentDescription="@string/app_name"
|
||||||
android:scaleType="center"
|
android:scaleType="center"
|
||||||
android:src="@drawable/star_of_life_24x24" />
|
app:srcCompat="@drawable/star_of_life_24x24" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/imageView"
|
android:id="@+id/imageView"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:src="@drawable/star_of_life_48x48" />
|
app:srcCompat="@drawable/star_of_life_48x48" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<group android:id="@+id/grp1">
|
<group android:id="@+id/grp1">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/pruneDatabaseMenuItem"
|
android:id="@+id/pruneDatabaseMenuItem"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/prune_database" />
|
android:title="@string/prune_database" />
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
@@ -11,7 +12,7 @@
|
|||||||
android:id="@+id/action_report_seizure"
|
android:id="@+id/action_report_seizure"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@drawable/ic_action_settings"
|
android:icon="@drawable/ic_action_settings"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/report_seizure" />
|
android:title="@string/report_seizure" />
|
||||||
|
|
||||||
|
|
||||||
@@ -19,7 +20,7 @@
|
|||||||
android:id="@+id/action_authenticate_api"
|
android:id="@+id/action_authenticate_api"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@drawable/ic_action_settings"
|
android:icon="@drawable/ic_action_settings"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/data_sharing_log_in" />
|
android:title="@string/data_sharing_log_in" />
|
||||||
|
|
||||||
</group>
|
</group>
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<group android:id="@+id/grp1">
|
<group android:id="@+id/grp1">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_accept_alarm"
|
android:id="@+id/action_accept_alarm"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/accept_alarm" />
|
android:title="@string/accept_alarm" />
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
@@ -10,7 +11,7 @@
|
|||||||
<item
|
<item
|
||||||
android:id="@+id/action_start_stop"
|
android:id="@+id/action_start_stop"
|
||||||
android:icon="@drawable/stop_server"
|
android:icon="@drawable/stop_server"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/start_stop_server" />
|
android:title="@string/start_stop_server" />
|
||||||
</group>
|
</group>
|
||||||
<group android:id="@+id/grp3">
|
<group android:id="@+id/grp3">
|
||||||
@@ -18,53 +19,53 @@
|
|||||||
android:id="@+id/action_report_seizure"
|
android:id="@+id/action_report_seizure"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@drawable/ic_action_settings"
|
android:icon="@drawable/ic_action_settings"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/report_seizure" />
|
android:title="@string/report_seizure" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_logmanager"
|
android:id="@+id/action_logmanager"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@drawable/ic_action_settings"
|
android:icon="@drawable/ic_action_settings"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/data_log_manager" />
|
android:title="@string/data_log_manager" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_authenticate_api"
|
android:id="@+id/action_authenticate_api"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@drawable/ic_action_settings"
|
android:icon="@drawable/ic_action_settings"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/data_sharing_log_in" />
|
android:title="@string/data_sharing_log_in" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_about_datasharing"
|
android:id="@+id/action_about_datasharing"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@drawable/ic_action_settings"
|
android:icon="@drawable/ic_action_settings"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="About Data Sharing..." />
|
android:title="About Data Sharing..." />
|
||||||
|
|
||||||
</group>
|
</group>
|
||||||
<group android:id="@+id/grp4">
|
<group android:id="@+id/grp4">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_install_watch_app"
|
android:id="@+id/action_install_watch_app"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/install_watch_app" />
|
android:title="@string/install_watch_app" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_test_alarm_beep"
|
android:id="@+id/action_test_alarm_beep"
|
||||||
android:icon="@drawable/stop_server"
|
android:icon="@drawable/stop_server"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/test_alarm_beep" />
|
android:title="@string/test_alarm_beep" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_test_warning_beep"
|
android:id="@+id/action_test_warning_beep"
|
||||||
android:icon="@drawable/stop_server"
|
android:icon="@drawable/stop_server"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/test_warning_beep" />
|
android:title="@string/test_warning_beep" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_test_sms_alarm"
|
android:id="@+id/action_test_sms_alarm"
|
||||||
android:icon="@drawable/stop_server"
|
android:icon="@drawable/stop_server"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/test_sms_alarm_notification" />
|
android:title="@string/test_sms_alarm_notification" />
|
||||||
</group>
|
</group>
|
||||||
<group android:id="@+id/grp5">
|
<group android:id="@+id/grp5">
|
||||||
@@ -86,7 +87,7 @@
|
|||||||
<item
|
<item
|
||||||
android:id="@+id/action_settings"
|
android:id="@+id/action_settings"
|
||||||
android:icon="@drawable/ic_action_settings"
|
android:icon="@drawable/ic_action_settings"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/settings" />
|
android:title="@string/settings" />
|
||||||
|
|
||||||
</group>
|
</group>
|
||||||
@@ -95,7 +96,7 @@
|
|||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_about"
|
android:id="@+id/action_about"
|
||||||
android:showAsAction="never|withText"
|
app:showAsAction="never|withText"
|
||||||
android:title="@string/about" />
|
android:title="@string/about" />
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user