diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fb83571a..abd90fb8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -12,7 +12,7 @@ - + diff --git a/gen/net/sourceforge/subsonic/androidapp/R.java b/gen/net/sourceforge/subsonic/androidapp/R.java index 8fda6cb4..0ef75e18 100644 --- a/gen/net/sourceforge/subsonic/androidapp/R.java +++ b/gen/net/sourceforge/subsonic/androidapp/R.java @@ -138,7 +138,6 @@ public final class R { public static final int unknown_album_large=0x7f020056; } public static final class id { - public static final int action_button_3=0x7f0d001e; public static final int album=0x7f0d004c; public static final int album_artist=0x7f0d0002; public static final int album_coverart=0x7f0d0000; @@ -227,6 +226,7 @@ public final class R { public static final int menu_remove_all=0x7f0d007f; public static final int menu_save_playlist=0x7f0d007e; public static final int menu_screen_on_off=0x7f0d0080; + public static final int menu_selector=0x7f0d001e; public static final int menu_settings=0x7f0d007a; public static final int menu_show_album=0x7f0d0081; public static final int menu_shuffle=0x7f0d0084; diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml index b672477f..eaf79c86 100644 --- a/res/layout-land/download.xml +++ b/res/layout-land/download.xml @@ -78,7 +78,7 @@ a:layout_weight="1" a:background="@android:color/transparent" a:padding="9dip" a:text="RC" a:textSize="22sp" a:textStyle="bold" /> - diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml index 5be26fa0..d76706e4 100644 --- a/res/layout-port/download.xml +++ b/res/layout-port/download.xml @@ -67,7 +67,7 @@ a:layout_height="wrap_content" a:layout_marginTop="0dip" a:background="@color/mediaControlBackground" a:orientation="horizontal" a:paddingBottom="0dip" a:paddingTop="0dip"> - diff --git a/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java index 62c701ca..e01248af 100644 --- a/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java +++ b/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java @@ -121,11 +121,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY); setContentView(R.layout.download); - getActionBar().hide(); - WindowManager w = getWindowManager(); Display d = w.getDefaultDisplay(); swipeDistance = (d.getWidth() + d.getHeight()) * PERCENTAGE_OF_SCREEN_FOR_SWIPE / 100; @@ -242,7 +239,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi }); // Button: menu - ImageButton actionMenuButton = (ImageButton)findViewById(R.id.action_button_3); + ImageButton actionMenuButton = (ImageButton)findViewById(R.id.menu_selector); actionMenuButton.setImageResource(R.drawable.ic_menu_moreoverflow); actionMenuButton.setOnClickListener(new View.OnClickListener() { @Override