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
2e2dfb1c
Commit
2e2dfb1c
authored
Jan 13, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"Up" buttons for PhraseEditor and PhraseList activities.
parent
a8914c67
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
4 deletions
+29
-4
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+13
-2
PhraseEditor.java
.../java/com/xabber/android/ui/preferences/PhraseEditor.java
+8
-1
PhraseList.java
...in/java/com/xabber/android/ui/preferences/PhraseList.java
+8
-1
No files found.
app/src/main/AndroidManifest.xml
View file @
2e2dfb1c
...
@@ -279,10 +279,21 @@
...
@@ -279,10 +279,21 @@
<activity
<activity
android:name=
"com.xabber.android.ui.preferences.PhraseList"
android:name=
"com.xabber.android.ui.preferences.PhraseList"
android:label=
"@string/events_phrases_title"
android:label=
"@string/events_phrases_title"
/>
android:parentActivityName=
"com.xabber.android.ui.preferences.PreferenceEditor"
>
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name=
"android.support.PARENT_ACTIVITY"
android:value=
"com.xabber.android.ui.preferences.PreferenceEditor"
/>
</activity>
<activity
<activity
android:name=
"com.xabber.android.ui.preferences.PhraseEditor"
android:name=
"com.xabber.android.ui.preferences.PhraseEditor"
/>
android:parentActivityName=
"com.xabber.android.ui.preferences.PhraseList"
>
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name=
"android.support.PARENT_ACTIVITY"
android:value=
"com.xabber.android.ui.preferences.PhraseList"
/>
</activity>
<activity
<activity
android:name=
"com.xabber.android.ui.ReconnectionActivity"
android:name=
"com.xabber.android.ui.ReconnectionActivity"
/>
/>
...
...
app/src/main/java/com/xabber/android/ui/preferences/PhraseEditor.java
View file @
2e2dfb1c
...
@@ -36,6 +36,13 @@ public class PhraseEditor extends BaseSettingsActivity {
...
@@ -36,6 +36,13 @@ public class PhraseEditor extends BaseSettingsActivity {
private
Phrase
phrase
;
private
Phrase
phrase
;
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
getActionBar
().
setDisplayHomeAsUpEnabled
(
true
);
}
@Override
@Override
protected
void
onInflate
(
Bundle
savedInstanceState
)
{
protected
void
onInflate
(
Bundle
savedInstanceState
)
{
addPreferencesFromResource
(
R
.
xml
.
phrase_editor
);
addPreferencesFromResource
(
R
.
xml
.
phrase_editor
);
...
...
app/src/main/java/com/xabber/android/ui/preferences/PhraseList.java
View file @
2e2dfb1c
...
@@ -27,6 +27,13 @@ import com.xabber.androiddev.R;
...
@@ -27,6 +27,13 @@ import com.xabber.androiddev.R;
public
class
PhraseList
extends
BaseListEditor
<
Integer
>
{
public
class
PhraseList
extends
BaseListEditor
<
Integer
>
{
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
getActionBar
().
setDisplayHomeAsUpEnabled
(
true
);
}
@Override
@Override
protected
int
getAddTextResourceId
()
{
protected
int
getAddTextResourceId
()
{
return
R
.
string
.
phrase_add
;
return
R
.
string
.
phrase_add
;
...
...
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