|
@@ -175,7 +175,7 @@ public class SettingsActivity extends PreferenceActivity
|
|
|
|
|
|
// Sync
|
|
// Sync
|
|
setupSyncCategory();
|
|
setupSyncCategory();
|
|
-
|
|
|
|
|
|
+
|
|
// More
|
|
// More
|
|
setupMoreCategory();
|
|
setupMoreCategory();
|
|
|
|
|
|
@@ -315,7 +315,7 @@ public class SettingsActivity extends PreferenceActivity
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private void setupSyncCategory() {
|
|
private void setupSyncCategory() {
|
|
final PreferenceCategory preferenceCategorySync = (PreferenceCategory) findPreference("sync");
|
|
final PreferenceCategory preferenceCategorySync = (PreferenceCategory) findPreference("sync");
|
|
viewThemeUtils.files.themePreferenceCategory(preferenceCategorySync);
|
|
viewThemeUtils.files.themePreferenceCategory(preferenceCategorySync);
|
|
@@ -559,10 +559,10 @@ public class SettingsActivity extends PreferenceActivity
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
private void setupInternalTwoWaySyncPreference(PreferenceCategory preferenceCategorySync) {
|
|
private void setupInternalTwoWaySyncPreference(PreferenceCategory preferenceCategorySync) {
|
|
Preference twoWaySync = findPreference("internal_two_way_sync");
|
|
Preference twoWaySync = findPreference("internal_two_way_sync");
|
|
-
|
|
|
|
|
|
+
|
|
twoWaySync.setOnPreferenceClickListener(preference -> {
|
|
twoWaySync.setOnPreferenceClickListener(preference -> {
|
|
Intent intent = new Intent(this, InternalTwoWaySyncActivity.class);
|
|
Intent intent = new Intent(this, InternalTwoWaySyncActivity.class);
|
|
startActivity(intent);
|
|
startActivity(intent);
|
|
@@ -886,7 +886,7 @@ public class SettingsActivity extends PreferenceActivity
|
|
|
|
|
|
if (getResources() == null) return;
|
|
if (getResources() == null) return;
|
|
Drawable menuIcon = ResourcesCompat.getDrawable(getResources(),
|
|
Drawable menuIcon = ResourcesCompat.getDrawable(getResources(),
|
|
- R.drawable.ic_menu,
|
|
|
|
|
|
+ R.drawable.ic_arrow_back,
|
|
null);
|
|
null);
|
|
|
|
|
|
if (menuIcon == null) return;
|
|
if (menuIcon == null) return;
|
|
@@ -896,12 +896,6 @@ public class SettingsActivity extends PreferenceActivity
|
|
menuIcon);
|
|
menuIcon);
|
|
}
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
|
- public void onBackPressed() {
|
|
|
|
- ContextExtensionsKt.sendOpenDrawerEvent(this);
|
|
|
|
- // super.onBackPressed();
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
private void launchDavDroidLogin() {
|
|
private void launchDavDroidLogin() {
|
|
Intent davDroidLoginIntent = new Intent();
|
|
Intent davDroidLoginIntent = new Intent();
|
|
davDroidLoginIntent.setClassName("at.bitfire.davdroid", "at.bitfire.davdroid.ui.setup.LoginActivity");
|
|
davDroidLoginIntent.setClassName("at.bitfire.davdroid", "at.bitfire.davdroid.ui.setup.LoginActivity");
|