mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-01-01 12:54:07 +00:00
Code Issues Releases Wiki Activity

Close search when opening settings to prevent keyboard from popping up

Browse source
This commit is contained in:
M66B 2016-01-09 17:48:24 +01:00
parent f008bd6028
commit ec83212c0d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/app.iml
View file

@ -98,6 +98,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/objectFiles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

3
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View file

@ -42,7 +42,6 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SwitchCompat;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.util.TypedValue;
@ -582,6 +581,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
return true;
case R.id.menu_settings:
if (menuSearch != null)
MenuItemCompat.collapseActionView(menuSearch);
startActivity(new Intent(this, ActivitySettings.class));
return true;