-
Notifications
You must be signed in to change notification settings - Fork 162
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Fragments' of https://github.com/daneren2005/Subsonic
- Loading branch information
Showing
106 changed files
with
6,073 additions
and
4,413 deletions.
There are no files selected for viewing
Submodule ActionBarSherlock
updated
797 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,130 +1,134 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:orientation="vertical" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent"> | ||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:id="@+id/download_layout_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent"> | ||
|
|
||
| <LinearLayout android:orientation="horizontal" | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:id="@+id/download_layout" | ||
| android:orientation="vertical" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="0dip" | ||
| android:layout_weight="1"> | ||
|
|
||
| <github.daneren2005.dsub.util.MyViewFlipper | ||
| android:id="@+id/download_playlist_flipper" | ||
| android:layout_width="0dp" | ||
| android:layout_height="fill_parent" | ||
| android:layout_height="fill_parent"> | ||
|
|
||
| <LinearLayout android:orientation="horizontal" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="0dip" | ||
| android:layout_weight="1"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/download_album_art_image" | ||
| android:src="@drawable/unknown_album_large" | ||
| android:layout_width="wrap_content" | ||
| <github.daneren2005.dsub.util.MyViewFlipper | ||
| android:id="@+id/download_playlist_flipper" | ||
| android:layout_width="0dp" | ||
| android:layout_height="fill_parent" | ||
| android:layout_weight="1"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/download_album_art_image" | ||
| android:src="@drawable/unknown_album_large" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="fill_parent" | ||
| android:layout_weight="1" | ||
| android:scaleType="fitCenter"/> | ||
|
|
||
| <include layout="@layout/download_playlist"/> | ||
|
|
||
| </github.daneren2005.dsub.util.MyViewFlipper> | ||
|
|
||
| <LinearLayout android:orientation="vertical" | ||
| android:id="@+id/download_control_layout" | ||
| android:layout_width="0dp" | ||
| android:layout_height="fill_parent" | ||
| android:layout_weight="1" | ||
| android:scaleType="fitCenter"/> | ||
|
|
||
| <include layout="@layout/download_playlist"/> | ||
|
|
||
| </github.daneren2005.dsub.util.MyViewFlipper> | ||
|
|
||
| <LinearLayout android:orientation="vertical" | ||
| android:id="@+id/download_control_layout" | ||
| android:layout_width="0dp" | ||
| android:layout_height="fill_parent" | ||
| android:layout_weight="1" | ||
| android:background="@android:color/transparent"> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/download_other_controls_layout" | ||
| android:orientation="horizontal" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_horizontal"> | ||
|
|
||
| <ImageButton | ||
| android:id="@+id/download_star" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_vertical" | ||
| android:background="@null" | ||
| android:src="@android:drawable/star_big_off"/> | ||
| <Button | ||
| android:id="@+id/download_equalizer" | ||
| android:text="EQ" | ||
| android:textStyle="bold" | ||
| android:textSize="22sp" | ||
| android:background="@android:color/transparent" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="3dip" | ||
| android:padding="9dip" | ||
| /> | ||
| <Button | ||
| android:id="@+id/download_jukebox" | ||
| android:text="RC" | ||
| android:textStyle="bold" | ||
| android:textSize="22sp" | ||
| android:background="@android:color/transparent" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="3dip" | ||
| android:padding="9dip" | ||
| /> | ||
| <Button | ||
| android:id="@+id/download_visualizer" | ||
| android:text="VIS" | ||
| android:textStyle="bold" | ||
| android:textSize="22sp" | ||
| android:background="@android:color/transparent" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="3dip" | ||
| android:padding="9dip" | ||
| /> | ||
| </LinearLayout> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/download_visualizer_view_layout" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="60dip" | ||
| android:layout_marginLeft="12dip" | ||
| android:layout_marginRight="12dip" | ||
| android:layout_gravity="center_horizontal"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/download_song_title" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_centerHorizontal="true" | ||
| android:layout_marginLeft="12dip" | ||
| android:layout_marginRight="12dip" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| android:gravity="center_horizontal" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" | ||
| android:textColor="?android:textColorPrimary"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/download_status" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center_horizontal" | ||
| android:layout_marginBottom="8dip" | ||
| android:layout_marginLeft="12dip" | ||
| android:layout_marginRight="12dip" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:textColor="?android:textColorSecondary" /> | ||
|
|
||
| <include layout="@layout/download_media_buttons"/> | ||
|
|
||
| <include layout="@layout/download_slider"/> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <include layout="@layout/button_bar"/> | ||
|
|
||
| </LinearLayout> | ||
| android:background="@android:color/transparent"> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/download_other_controls_layout" | ||
| android:orientation="horizontal" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_horizontal"> | ||
|
|
||
| <ImageButton | ||
| android:id="@+id/download_star" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_vertical" | ||
| android:background="@null" | ||
| android:src="@android:drawable/star_big_off"/> | ||
| <Button | ||
| android:id="@+id/download_equalizer" | ||
| android:text="EQ" | ||
| android:textStyle="bold" | ||
| android:textSize="22sp" | ||
| android:background="@android:color/transparent" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="3dip" | ||
| android:padding="9dip" | ||
| /> | ||
| <Button | ||
| android:id="@+id/download_jukebox" | ||
| android:text="RC" | ||
| android:textStyle="bold" | ||
| android:textSize="22sp" | ||
| android:background="@android:color/transparent" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="3dip" | ||
| android:padding="9dip" | ||
| /> | ||
| <Button | ||
| android:id="@+id/download_visualizer" | ||
| android:text="VIS" | ||
| android:textStyle="bold" | ||
| android:textSize="22sp" | ||
| android:background="@android:color/transparent" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="3dip" | ||
| android:padding="9dip" | ||
| /> | ||
| </LinearLayout> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/download_visualizer_view_layout" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="60dip" | ||
| android:layout_marginLeft="12dip" | ||
| android:layout_marginRight="12dip" | ||
| android:layout_gravity="center_horizontal"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/download_song_title" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_centerHorizontal="true" | ||
| android:layout_marginLeft="12dip" | ||
| android:layout_marginRight="12dip" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| android:gravity="center_horizontal" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" | ||
| android:textColor="?android:textColorPrimary"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/download_status" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center_horizontal" | ||
| android:layout_marginBottom="8dip" | ||
| android:layout_marginLeft="12dip" | ||
| android:layout_marginRight="12dip" | ||
| android:singleLine="true" | ||
| android:ellipsize="end" | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:textColor="?android:textColorSecondary" /> | ||
|
|
||
| <include layout="@layout/download_media_buttons"/> | ||
|
|
||
| <include layout="@layout/download_slider"/> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> | ||
| </LinearLayout> | ||
| </FrameLayout> |
Oops, something went wrong.