mirror of https://github.com/M66B/NetGuard.git
Fixed up navigation
http://developer.android.com/training/implementing-navigation/ancestral.html Refs #243
This commit is contained in:
parent
7f9e435504
commit
7c43ba977d
|
@ -49,18 +49,31 @@
|
|||
android:name=".ActivitySettings"
|
||||
android:configChanges="orientation|screenSize"
|
||||
android:label="@string/menu_settings"
|
||||
android:parentActivityName=".ActivityMain" />
|
||||
android:parentActivityName=".ActivityMain">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value=".ActivityMain" />
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
android:name=".ActivityLog"
|
||||
android:configChanges="orientation|screenSize"
|
||||
android:label="@string/menu_log"
|
||||
android:parentActivityName=".ActivityMain" />
|
||||
android:parentActivityName=".ActivityMain">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value=".ActivityMain" />
|
||||
</activity>
|
||||
|
||||
<activity
|
||||
android:name=".ActivityPro"
|
||||
android:configChanges="orientation|screenSize"
|
||||
android:label="@string/title_pro" />
|
||||
android:label="@string/title_pro"
|
||||
android:parentActivityName=".ActivityMain">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value=".ActivityMain" />
|
||||
</activity>
|
||||
|
||||
<service
|
||||
android:name=".SinkholeService"
|
||||
|
|
|
@ -28,6 +28,7 @@ import android.os.AsyncTask;
|
|||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.v4.app.NavUtils;
|
||||
import android.support.v4.view.MenuItemCompat;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.support.v7.widget.SearchView;
|
||||
|
@ -316,6 +317,11 @@ public class ActivityLog extends AppCompatActivity implements SharedPreferences.
|
|||
final File pcap_file = new File(getCacheDir(), "netguard.pcap");
|
||||
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
Log.i(TAG, "Up");
|
||||
NavUtils.navigateUpFromSameTask(this);
|
||||
return true;
|
||||
|
||||
case R.id.menu_log_live:
|
||||
item.setChecked(!item.isChecked());
|
||||
live = item.isChecked();
|
||||
|
|
|
@ -22,6 +22,7 @@ package eu.faircode.netguard;
|
|||
import android.content.Intent;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.NavUtils;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.text.Editable;
|
||||
import android.text.TextWatcher;
|
||||
|
@ -183,14 +184,17 @@ public class ActivityPro extends AppCompatActivity {
|
|||
super.onDestroy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
finish();
|
||||
Log.i(TAG, "Up");
|
||||
NavUtils.navigateUpFromSameTask(this);
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
|
|
|
@ -47,6 +47,7 @@ import android.preference.PreferenceManager;
|
|||
import android.preference.PreferenceScreen;
|
||||
import android.preference.TwoStatePreference;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v4.app.NavUtils;
|
||||
import android.support.v4.content.LocalBroadcastManager;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.telephony.PhoneStateListener;
|
||||
|
@ -56,6 +57,7 @@ import android.text.TextUtils;
|
|||
import android.util.Log;
|
||||
import android.util.Xml;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
|
@ -342,6 +344,18 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
Log.i(TAG, "Up");
|
||||
NavUtils.navigateUpFromSameTask(this);
|
||||
return true;
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
public void onSharedPreferenceChanged(SharedPreferences prefs, String name) {
|
||||
|
|
Loading…
Reference in New Issue