Commit 26979aa1 authored by Grigory Fedorov's avatar Grigory Fedorov

Correct titles for settings activities.

parent 9447a4c6
......@@ -89,9 +89,7 @@ public class AccountEditor extends BaseSettingsActivity implements
if (!Application.getInstance().isContactsSupported())
getPreferenceScreen().removePreference(
findPreference(getString(R.string.account_syncable_key)));
setTitle(getString(R.string.account_editor_title,
getString(protocol.getShortResource()), AccountManager
.getInstance().getVerboseName(account)));
setTitle(AccountManager.getInstance().getVerboseName(account));
if (savedInstanceState == null)
token = accountItem.getConnectionSettings().getPassword();
else
......
......@@ -31,6 +31,7 @@ import com.xabber.android.ui.StatusEditor;
import com.xabber.android.ui.adapter.AccountListAdapter;
import com.xabber.android.ui.adapter.BaseListEditorAdapter;
import com.xabber.android.ui.helper.BaseListEditor;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class AccountList extends BaseListEditor<String> implements
......@@ -43,6 +44,8 @@ public class AccountList extends BaseListEditor<String> implements
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_accounts)));
}
@Override
......
......@@ -3,6 +3,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class ChatSettings extends ManagedActivity {
......@@ -15,6 +16,8 @@ public class ChatSettings extends ManagedActivity {
setContentView(R.layout.activity_preferences);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.chat_viewer)));
getActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
......
......@@ -3,6 +3,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class ConnectionSettings extends ManagedActivity {
......@@ -15,6 +16,8 @@ public class ConnectionSettings extends ManagedActivity {
setContentView(R.layout.activity_preferences);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_connection)));
getActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
......
......@@ -3,6 +3,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class ContactListSettings extends ManagedActivity {
......@@ -14,6 +15,8 @@ public class ContactListSettings extends ManagedActivity {
setContentView(R.layout.activity_preferences);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_contacts)));
getActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
......
......@@ -3,6 +3,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class DebugSettings extends ManagedActivity {
......@@ -15,6 +16,8 @@ public class DebugSettings extends ManagedActivity {
setContentView(R.layout.activity_preferences);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_debug)));
getActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
......
......@@ -4,6 +4,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class NotificationsSettings extends ManagedActivity {
......@@ -16,6 +17,8 @@ public class NotificationsSettings extends ManagedActivity {
setContentView(R.layout.activity_preferences);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_events)));
getActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
......
......@@ -3,6 +3,7 @@ package com.xabber.android.ui.preferences;
import android.os.Bundle;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class SecuritySettings extends ManagedActivity {
......@@ -15,6 +16,8 @@ public class SecuritySettings extends ManagedActivity {
setContentView(R.layout.activity_preferences);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_security)));
getActionBar().setDisplayHomeAsUpEnabled(true);
if (savedInstanceState == null) {
......
......@@ -5,6 +5,7 @@ import android.os.Bundle;
import com.xabber.android.data.ActivityManager;
import com.xabber.android.ui.ContactList;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.helper.PreferenceSummaryHelper;
import com.xabber.androiddev.R;
public class ThemeSettings extends ManagedActivity
......@@ -20,6 +21,8 @@ public class ThemeSettings extends ManagedActivity
getActionBar().setDisplayHomeAsUpEnabled(true);
setTitle(PreferenceSummaryHelper.getPreferenceTitle(getString(R.string.preference_interface)));
if (savedInstanceState == null) {
getFragmentManager().beginTransaction()
.add(R.id.preferences_activity_container, new ThemeSettingsFragment()).commit();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment