use proper height resource for support actionbar spacer

This commit is contained in:
Andrew Dolgov 2015-05-11 13:02:46 +03:00
parent 6e4ab99134
commit 8484fa22e6
4 changed files with 6 additions and 7 deletions

View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="327" android:versionCode="328"
android:versionName="1.101" > android:versionName="1.102" >
<uses-sdk <uses-sdk
android:minSdkVersion="15" android:minSdkVersion="15"
android:targetSdkVersion="21" /> android:targetSdkVersion="21" />
<uses-permission android:name="android.permission.INTERNET" /> <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.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

View File

@ -108,11 +108,11 @@ public class OfflineDownloadService extends Service {
.setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(),
R.drawable.ic_launcher)) R.drawable.ic_launcher))
.setOngoing(true) .setOngoing(true)
.setOnlyAlertOnce(true) .setOnlyAlertOnce(true);
.setVibrate(new long[0]);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
builder.setCategory(Notification.CATEGORY_PROGRESS) builder.setCategory(Notification.CATEGORY_PROGRESS)
.setVibrate(new long[0])
.setVisibility(Notification.VISIBILITY_PUBLIC) .setVisibility(Notification.VISIBILITY_PUBLIC)
.setColor(0x88b0f0) .setColor(0x88b0f0)
.setGroup("org.fox.ttrss"); .setGroup("org.fox.ttrss");

View File

@ -26,7 +26,7 @@
<FrameLayout <FrameLayout
android:id="@+id/article_heading_spacer" android:id="@+id/article_heading_spacer"
android:visibility="gone" 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_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>

View File

@ -3,6 +3,6 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_heading_spacer" android:id="@+id/headlines_heading_spacer"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="?android:attr/actionBarSize"> android:layout_height="@dimen/abc_action_bar_default_height_material">
</FrameLayout> </FrameLayout>