Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
xabber-android
Commits
26979aa1
Commit
26979aa1
authored
Jan 14, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct titles for settings activities.
parent
9447a4c6
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
3 deletions
+25
-3
AccountEditor.java
...java/com/xabber/android/ui/preferences/AccountEditor.java
+1
-3
AccountList.java
...n/java/com/xabber/android/ui/preferences/AccountList.java
+3
-0
ChatSettings.java
.../java/com/xabber/android/ui/preferences/ChatSettings.java
+3
-0
ConnectionSettings.java
...com/xabber/android/ui/preferences/ConnectionSettings.java
+3
-0
ContactListSettings.java
...om/xabber/android/ui/preferences/ContactListSettings.java
+3
-0
DebugSettings.java
...java/com/xabber/android/ui/preferences/DebugSettings.java
+3
-0
NotificationsSettings.java
.../xabber/android/ui/preferences/NotificationsSettings.java
+3
-0
SecuritySettings.java
...a/com/xabber/android/ui/preferences/SecuritySettings.java
+3
-0
ThemeSettings.java
...java/com/xabber/android/ui/preferences/ThemeSettings.java
+3
-0
No files found.
app/src/main/java/com/xabber/android/ui/preferences/AccountEditor.java
View file @
26979aa1
...
...
@@ -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
...
...
app/src/main/java/com/xabber/android/ui/preferences/AccountList.java
View file @
26979aa1
...
...
@@ -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
...
...
app/src/main/java/com/xabber/android/ui/preferences/ChatSettings.java
View file @
26979aa1
...
...
@@ -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
)
{
...
...
app/src/main/java/com/xabber/android/ui/preferences/ConnectionSettings.java
View file @
26979aa1
...
...
@@ -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
)
{
...
...
app/src/main/java/com/xabber/android/ui/preferences/ContactListSettings.java
View file @
26979aa1
...
...
@@ -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
)
{
...
...
app/src/main/java/com/xabber/android/ui/preferences/DebugSettings.java
View file @
26979aa1
...
...
@@ -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
)
{
...
...
app/src/main/java/com/xabber/android/ui/preferences/NotificationsSettings.java
View file @
26979aa1
...
...
@@ -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
)
{
...
...
app/src/main/java/com/xabber/android/ui/preferences/SecuritySettings.java
View file @
26979aa1
...
...
@@ -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
)
{
...
...
app/src/main/java/com/xabber/android/ui/preferences/ThemeSettings.java
View file @
26979aa1
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment