diff options
author | Andrew Dolgov <[email protected]> | 2015-05-11 13:02:46 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-05-11 13:02:46 +0300 |
commit | 8484fa22e6666d87a0180e94b3182e4ff603118f (patch) | |
tree | 6e1b6ae8b4010ad34dd46c60c27e3e45da715851 /org.fox.ttrss | |
parent | 6e4ab9913473f504ed179b2519a27a81b75ba4a3 (diff) |
use proper height resource for support actionbar spacer
Diffstat (limited to 'org.fox.ttrss')
4 files changed, 6 insertions, 7 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 7390e173..65582a3b 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="327" - android:versionName="1.101" > + android:versionCode="328" + android:versionName="1.102" > <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="21" /> <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> 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 e90899e8..bf641ad0 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 @@ -108,11 +108,11 @@ public class OfflineDownloadService extends Service { .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher)) .setOngoing(true) - .setOnlyAlertOnce(true) - .setVibrate(new long[0]); + .setOnlyAlertOnce(true); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { builder.setCategory(Notification.CATEGORY_PROGRESS) + .setVibrate(new long[0]) .setVisibility(Notification.VISIBILITY_PUBLIC) .setColor(0x88b0f0) .setGroup("org.fox.ttrss"); diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml index 77e9928a..4dd0dff3 100755 --- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml @@ -26,7 +26,7 @@ <FrameLayout android:id="@+id/article_heading_spacer" android:visibility="gone" - android:layout_marginTop="?android:attr/actionBarSize" + android:layout_marginTop="@dimen/abc_action_bar_default_height_material" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_heading_spacer.xml b/org.fox.ttrss/src/main/res/layout/headlines_heading_spacer.xml index 73aa09e0..0fed31bf 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_heading_spacer.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_heading_spacer.xml @@ -3,6 +3,6 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines_heading_spacer" android:layout_width="fill_parent" - android:layout_height="?android:attr/actionBarSize"> + android:layout_height="@dimen/abc_action_bar_default_height_material"> </FrameLayout>
\ No newline at end of file |