diff options
Diffstat (limited to 'org.fox.ttrss/src/main/java/org')
7 files changed, 23 insertions, 6 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java index 8fd503a1..edab6491 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java @@ -491,7 +491,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, feed.title); intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); - intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(this, R.drawable.icon)); + intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher)); intent.putExtra("duplicate", false); sendBroadcast(intent); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java index e6d300f0..09a514f4 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java @@ -1,6 +1,9 @@ package org.fox.ttrss; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.os.Bundle; +import android.preference.Preference; import android.preference.PreferenceActivity; public class PreferencesActivity extends PreferenceActivity { @@ -19,6 +22,20 @@ public class PreferencesActivity extends PreferenceActivity { if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) { findPreference("enable_condensed_fonts").setEnabled(false); } + + Preference versionPref = (Preference)findPreference("version"); + String version = null; + int versionCode = -1; + try { + PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0); + + version = packageInfo.versionName; + versionCode = packageInfo.versionCode; + + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + versionPref.setTitle(getString(R.string.version, version, versionCode)); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java index 2d65c890..7a85d210 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java @@ -90,7 +90,7 @@ public class OfflineDownloadService extends Service { @SuppressWarnings("deprecation") private void updateNotification(String msg) { - Notification notification = new Notification(R.drawable.icon, + Notification notification = new Notification(R.drawable.ic_launcher, getString(R.string.notify_downloading_title), System.currentTimeMillis()); Intent intent = new Intent(this, OnlineActivity.class); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java index 989f1e45..dbc56fbf 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java @@ -53,7 +53,7 @@ public class OfflineUploadService extends IntentService { @SuppressWarnings("deprecation") private void updateNotification(String msg) { - Notification notification = new Notification(R.drawable.icon, + Notification notification = new Notification(R.drawable.ic_launcher, getString(R.string.notify_uploading_title), System.currentTimeMillis()); PendingIntent contentIntent = PendingIntent.getActivity(this, 0, diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java index 12a8b14b..fb48580d 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java @@ -41,7 +41,7 @@ public class ShareActivity extends CommonShareActivity { setContentView(R.layout.share); - getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.icon); + getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.ic_launcher); setSmallScreen(false); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java index bd7e964f..69bc8a2e 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java @@ -84,7 +84,7 @@ public class SubscribeActivity extends CommonShareActivity { setContentView(R.layout.subscribe); - getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.icon); + getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.ic_launcher); setSmallScreen(false); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java index 5b029fc6..f59f9b00 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java @@ -128,7 +128,7 @@ public class ImageCacheService extends IntentService { @SuppressWarnings("deprecation") private void updateNotification(String msg) { - Notification notification = new Notification(R.drawable.icon, + Notification notification = new Notification(R.drawable.ic_launcher, getString(R.string.notify_downloading_title), System.currentTimeMillis()); PendingIntent contentIntent = PendingIntent.getActivity(this, 0, |