mirror of https://github.com/M66B/NetGuard.git
Fix back navigation
This commit is contained in:
parent
9c26fd2b58
commit
5bf67953a3
|
@ -52,7 +52,8 @@
|
|||
<activity
|
||||
android:name=".ActivityLog"
|
||||
android:configChanges="orientation|screenSize"
|
||||
android:label="@string/title_log" />
|
||||
android:label="@string/title_log"
|
||||
android:parentActivityName=".ActivityMain" />
|
||||
|
||||
<activity
|
||||
android:name=".ActivityPro"
|
||||
|
|
|
@ -79,9 +79,6 @@ public class ActivityLog extends AppCompatActivity {
|
|||
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
finish();
|
||||
return true;
|
||||
case R.id.menu_clear:
|
||||
dh.clear();
|
||||
return true;
|
||||
|
|
|
@ -425,6 +425,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
|
|||
|
||||
private void updateApplicationList(final String search) {
|
||||
Log.i(TAG, "Update search=" + search);
|
||||
|
||||
new AsyncTask<Object, Object, List<Rule>>() {
|
||||
private boolean refreshing = true;
|
||||
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
tools:context=".ActivityLog">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvTime"
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp">
|
||||
android:padding="16dp"
|
||||
tools:context=".ActivityPro">
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
|
|
Loading…
Reference in New Issue