Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Use ActionBar on all activities

This commit is contained in:
Joshua Bahnsen 2013-01-07 01:00:33 -07:00
parent 6fbf88611b
commit 25a32cd934
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -12,7 +12,7 @@
<uses-permission a:name="android.permission.RECORD_AUDIO"/> <uses-permission a:name="android.permission.RECORD_AUDIO"/>
<uses-permission a:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <uses-permission a:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-sdk a:minSdkVersion="11" a:targetSdkVersion="14"/> <uses-sdk a:minSdkVersion="13" a:targetSdkVersion="16"/>
<supports-screens a:anyDensity="true" a:xlargeScreens="true" a:largeScreens="true" a:normalScreens="true" a:smallScreens="true"/> <supports-screens a:anyDensity="true" a:xlargeScreens="true" a:largeScreens="true" a:normalScreens="true" a:smallScreens="true"/>

2
gen/net/sourceforge/subsonic/androidapp/R.java
View File

@ -138,7 +138,6 @@ public final class R {
public static final int unknown_album_large=0x7f020056; public static final int unknown_album_large=0x7f020056;
} }
public static final class id { public static final class id {
public static final int action_button_3=0x7f0d001e;
public static final int album=0x7f0d004c; public static final int album=0x7f0d004c;
public static final int album_artist=0x7f0d0002; public static final int album_artist=0x7f0d0002;
public static final int album_coverart=0x7f0d0000; 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_remove_all=0x7f0d007f;
public static final int menu_save_playlist=0x7f0d007e; public static final int menu_save_playlist=0x7f0d007e;
public static final int menu_screen_on_off=0x7f0d0080; 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_settings=0x7f0d007a;
public static final int menu_show_album=0x7f0d0081; public static final int menu_show_album=0x7f0d0081;
public static final int menu_shuffle=0x7f0d0084; public static final int menu_shuffle=0x7f0d0084;

2
res/layout-land/download.xml
View File

@ -78,7 +78,7 @@
a:layout_weight="1" a:background="@android:color/transparent" a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="RC" a:textSize="22sp" a:textStyle="bold" /> a:padding="9dip" a:text="RC" a:textSize="22sp" a:textStyle="bold" />
<ImageButton a:id="@+id/action_button_3" a:layout_width="0dp" <ImageButton a:id="@+id/menu_selector" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_weight="1" a:layout_height="match_parent" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:padding="9dip" a:background="@drawable/list_selector_holo_dark" a:padding="9dip"
a:src="@drawable/ic_menu_moreoverflow" /> a:src="@drawable/ic_menu_moreoverflow" />

2
res/layout-port/download.xml
View File

@ -67,7 +67,7 @@
a:layout_height="wrap_content" a:layout_marginTop="0dip" a:layout_height="wrap_content" a:layout_marginTop="0dip"
a:background="@color/mediaControlBackground" a:orientation="horizontal" a:background="@color/mediaControlBackground" a:orientation="horizontal"
a:paddingBottom="0dip" a:paddingTop="0dip"> a:paddingBottom="0dip" a:paddingTop="0dip">
<ImageButton a:id="@+id/action_button_3" a:layout_width="0dp" <ImageButton a:id="@+id/menu_selector" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_weight="1" a:layout_height="wrap_content" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:paddingBottom="12dip" a:background="@drawable/list_selector_holo_dark" a:paddingBottom="12dip"
a:paddingLeft="8dip" a:paddingTop="12dip" a:src="@drawable/ic_menu_moreoverflow" /> a:paddingLeft="8dip" a:paddingTop="12dip" a:src="@drawable/ic_menu_moreoverflow" />

5
src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java
View File

@ -121,11 +121,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
setContentView(R.layout.download); setContentView(R.layout.download);
getActionBar().hide();
WindowManager w = getWindowManager(); WindowManager w = getWindowManager();
Display d = w.getDefaultDisplay(); Display d = w.getDefaultDisplay();
swipeDistance = (d.getWidth() + d.getHeight()) * PERCENTAGE_OF_SCREEN_FOR_SWIPE / 100; swipeDistance = (d.getWidth() + d.getHeight()) * PERCENTAGE_OF_SCREEN_FOR_SWIPE / 100;
@ -242,7 +239,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
}); });
// Button: menu // 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.setImageResource(R.drawable.ic_menu_moreoverflow);
actionMenuButton.setOnClickListener(new View.OnClickListener() { actionMenuButton.setOnClickListener(new View.OnClickListener() {
@Override @Override