Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

use up/back to persist values intead of "Save"

n8fr814a76a9f55ab
diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.java
index bf24831..3a02420 100644
--- a/src/main/java/org/havenapp/main/SettingsActivity.java
+++ b/src/main/java/org/havenapp/main/SettingsActivity.java
@@ -44,6 +44,8 @@ public class SettingsActivity extends AppCompatActivity {
.add(R.id.settings_fragment, mFragment)
.commit();
}
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
index 05df404..cb205bc 100644
--- a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java
@@ -277,19 +277,11 @@ public class AccelConfigureActivity extends AppCompatActivity implements SensorE
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.monitor_start, menu);
- return true;
- }
-
@Override
public boolean onOptionsItemSelected (MenuItem item) {
switch (item.getItemId()){
- case R.id.menu_save:
- save();
- break;
case android.R.id.home:
+ save();
finish();
break;
}
diff --git a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
index ad6a419..c78661f 100644
--- a/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java
@@ -257,19 +257,11 @@ public class MicrophoneConfigureActivity extends AppCompatActivity implements Mi
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.monitor_start, menu);
- return true;
- }
-
@Override
public boolean onOptionsItemSelected (MenuItem item) {
switch (item.getItemId()){
- case R.id.menu_save:
- save();
- break;
case android.R.id.home:
+ save();
finish();
break;
}
diff --git a/src/main/res/menu/monitor_start.xml b/src/main/res/menu/monitor_start.xml
deleted file mode 100644
index 062f430..0000000
--- a/src/main/res/menu/monitor_start.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
- <item android:id="@+id/menu_save"
- android:title="@string/menu_save"
- android:orderInCategory="100"
- app:showAsAction="always|withText" />
-</menu>