|
|
@@ -50,6 +50,7 @@ import info.knacki.pass.io.OnResponseListener;
|
|
|
import info.knacki.pass.io.PathUtils;
|
|
|
import info.knacki.pass.io.pgp.GPGStorageEngine;
|
|
|
import info.knacki.pass.io.pgp.GPGUtil;
|
|
|
+import info.knacki.pass.services.AccessibilityService;
|
|
|
import info.knacki.pass.settings.SettingsManager;
|
|
|
import info.knacki.pass.ui.GitPullActivity;
|
|
|
import info.knacki.pass.ui.alertPrompt.AlertPromptGenerator;
|
|
|
@@ -163,6 +164,13 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
|
|
|
public void onResume() {
|
|
|
super.onResume();
|
|
|
findPreference(getResources().getString(R.string.id_softSettings)).setSummary(IsKeyboardEnabled() ? R.string.pref_summary_keyboard_enabled : R.string.pref_summary_enable_keyboard);
|
|
|
+ if (IsAccessibilityEnabled()) {
|
|
|
+ findPreference(getResources().getString(R.string.id_accessibility_settings)).setSummary(R.string.pref_summary_accessibility_enabled);
|
|
|
+ findPreference(getResources().getString(R.string.id_draw_over_settings)).setSummary(IsDrawOverEnabled() ? R.string.pref_summary_draw_over_enabled : R.string.pref_summary_draw_over_enable);
|
|
|
+ } else {
|
|
|
+ findPreference(getResources().getString(R.string.id_accessibility_settings)).setSummary(R.string.pref_summary_accessibility_disabled);
|
|
|
+ findPreference(getResources().getString(R.string.id_draw_over_settings)).setSummary(R.string.pref_summary_draw_over_unneeded);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -175,7 +183,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
|
|
|
return super.onOptionsItemSelected(item);
|
|
|
}
|
|
|
|
|
|
- public boolean IsKeyboardEnabled() {
|
|
|
+ private boolean IsKeyboardEnabled() {
|
|
|
InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(INPUT_METHOD_SERVICE);
|
|
|
|
|
|
for (InputMethodInfo i: inputManager.getEnabledInputMethodList())
|
|
|
@@ -183,6 +191,16 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
|
|
|
return true;
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
+ private boolean IsAccessibilityEnabled() {
|
|
|
+ return AccessibilityService.IsRunning();
|
|
|
+ }
|
|
|
+
|
|
|
+ private boolean IsDrawOverEnabled() {
|
|
|
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
|
|
|
+ return Settings.canDrawOverlays(getActivity());
|
|
|
+ return true;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public static class EncryptionPreferenceFragment extends PreferenceFragment {
|