diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-10-05 16:05:56 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-10-05 16:05:56 +0200 |
commit | 383d1aa9e64a245f17dd7ec6d177bb286a489f62 (patch) | |
tree | 0b9d8a50cab4384063669b794ce91804b0a7545c /src/main/java/eu/siacs/conversations/ui/AboutPreference.java | |
parent | c3c42e415ddd7832fea66766377fb4f0d935537a (diff) | |
parent | 1db6e6d5eadbad04768be823b8dbd32827b9b5c3 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Manually merged conflicting files:
src/main/AndroidManifest.xml
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
src/main/java/eu/siacs/conversations/generator/IqGenerator.java
src/main/java/eu/siacs/conversations/ui/AboutPreference.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/AboutPreference.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/AboutPreference.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java index a57e1b89..6ad34257 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java +++ b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java @@ -6,7 +6,7 @@ import android.content.pm.PackageManager; import android.preference.Preference; import android.util.AttributeSet; -import eu.siacs.conversations.utils.PhoneHelper; +import de.thedevstack.conversationsplus.ConversationsPlusApplication; public class AboutPreference extends Preference { public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { @@ -27,7 +27,7 @@ public class AboutPreference extends Preference { } private void setSummary() { - setSummary("Conversations " + PhoneHelper.getVersionName(getContext())); + setSummary(ConversationsPlusApplication.getNameAndVersion()); } } |