summaryrefslogtreecommitdiffstats
path: root/res/layout/activity_player_fragment.xml
diff options
context:
space:
mode:
authorLinus Lee <llee@cyngn.com>2015-04-17 18:52:24 -0700
committerLinus Lee <llee@cyngn.com>2015-05-20 14:46:36 -0700
commit442768038f32eede422e0a3e7ec8235d564cd0b5 (patch)
tree09a235e2bf6052ad6298a62ba148e8469991b46b /res/layout/activity_player_fragment.xml
parenta02bc80dd6a52555b8dc0801acaf4893bbe295f9 (diff)
downloadandroid_packages_apps_Eleven-442768038f32eede422e0a3e7ec8235d564cd0b5.tar.gz
android_packages_apps_Eleven-442768038f32eede422e0a3e7ec8235d564cd0b5.tar.bz2
android_packages_apps_Eleven-442768038f32eede422e0a3e7ec8235d564cd0b5.zip
Add Landscape support to Eleven
This adds most of the support. There is a bug around the album art not loading on rotation - but this patch covers pretty much every other case Change-Id: If9033b0323beab8837493d289dcf77b76d1ea8c9
Diffstat (limited to 'res/layout/activity_player_fragment.xml')
-rw-r--r--res/layout/activity_player_fragment.xml239
1 files changed, 2 insertions, 237 deletions
diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml
index 2b2c4f6..3e47c08 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -25,242 +25,7 @@
android:id="@+id/audio_player_header"
layout="@layout/audio_player_header_bar" />
- <com.cyanogenmod.eleven.widgets.SquareFrame
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <com.cyanogenmod.eleven.widgets.SquareViewPager
- android:id="@+id/audio_player_album_art_viewpager"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
- <include layout="@layout/loading_empty_container" />
+ <include layout="@layout/main_album_flow" />
- <View
- android:id="@+id/equalizerGradient"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/equalizer_background"
- android:layout_gravity="bottom"/>
-
- <com.cyanogenmod.eleven.widgets.EqualizerView
- android:id="@+id/equalizerView"
- android:gravity="bottom"
- android:layout_gravity="bottom"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false"
- android:clipToPadding="false"
- android:visibility="visible" />
-
- <TextView
- android:id="@+id/audio_player_lyrics"
- android:layout_gravity="center"
- android:gravity="center"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:minHeight="66dp"
- android:paddingLeft="15dp"
- android:paddingRight="15dp"
- android:paddingTop="6dp"
- android:paddingBottom="6dp"
- android:background="@color/lyrics_background_color"
- android:textColor="@color/white"
- android:textSize="@dimen/text_size_small"
- android:alpha="0.0"/>
- </com.cyanogenmod.eleven.widgets.SquareFrame>
-
- <RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@android:color/transparent" >
- <com.cyanogenmod.eleven.widgets.PlayPauseProgressButton
- android:id="@+id/playPauseProgressButton"
- android:layout_width="@dimen/audio_player_controls_main_button_width"
- android:layout_height="@dimen/audio_player_controls_main_button_height"
- android:layout_centerInParent="true" >
-
- <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
- <com.cyanogenmod.eleven.widgets.PlayPauseButton
- android:id="@+id/action_button_play"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:contentDescription="@string/accessibility_play"
- android:focusable="true"
- android:scaleType="centerCrop"
- android:src="@drawable/btn_playback_play" />
-
- <ProgressBar
- android:id="@+id/progressBarBackground"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="false"
- android:indeterminate="false"
- android:max="100"
- android:progress="100"
- android:progressDrawable="@drawable/now_playing_progress_background" />
-
- <ProgressBar
- android:id="@+id/circularProgressBar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="false"
- android:indeterminate="false"
- android:max="100"
- android:progressDrawable="@drawable/now_playing_progress" />
- </com.cyanogenmod.eleven.widgets.PlayPauseProgressButton>
-
- <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
- <!-- ANSWER: two issues (a) centerInside doesn't scale up, only down, use
- fitCenter instead. Also, ImageButtons come with built-in padding, but
- that only makes a visible difference when you are scaling the image.
- so you have to set the padding to zero in order to get the result you expect -->
- <!-- This is the left side of the progress bar - it has the previous
- and shuffle button and the current time text -->
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:layout_toLeftOf="@id/playPauseProgressButton">
-
- <TextView
- android:id="@+id/audio_player_current_time"
- android:layout_width="52dp"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:gravity="left|center_vertical"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:paddingLeft="@dimen/audio_player_time_text_padding"
- android:textColor="@color/audio_player_text_color"
- android:textSize="@dimen/audio_player_time_text_size"
- android:textStyle="bold"/>
-
- <com.cyanogenmod.eleven.widgets.RepeatingImageButton
- android:id="@+id/action_button_previous"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_toLeftOf="@id/audio_player_current_time"
- android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_previous" />
-
- <!-- divider -->
- <View
- android:id="@+id/action_button_left_top_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentRight="true"
- android:layout_above="@id/audio_player_current_time"
- android:background="@color/now_playing_divider" />
-
- <!-- divider -->
- <View
- android:id="@+id/action_button_left_bottom_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginRight="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentRight="true"
- android:layout_below="@id/audio_player_current_time"
- android:background="@color/now_playing_divider" />
-
- <com.cyanogenmod.eleven.widgets.BrowseButton
- android:id="@+id/action_button_browse"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_above="@id/action_button_left_top_divider"
- android:layout_alignLeft="@id/action_button_previous"
- android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_browse"
- android:focusable="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_browse" />
-
- <com.cyanogenmod.eleven.widgets.ShuffleButton
- android:id="@+id/action_button_shuffle"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_below="@id/action_button_left_bottom_divider"
- android:layout_alignLeft="@id/action_button_previous"
- android:layout_marginLeft="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_shuffle"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_shuffle_all" />
- </RelativeLayout>
-
- <!-- This is the right side of the progress bar - it has the next
- and repeat button and the total time text -->
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:layout_toRightOf="@id/playPauseProgressButton">
-
- <TextView
- android:id="@+id/audio_player_total_time"
- android:layout_width="52dp"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:paddingRight="@dimen/audio_player_time_text_padding"
- android:gravity="right|center_vertical"
- android:textColor="@color/audio_player_text_color"
- android:textSize="@dimen/audio_player_time_text_size"
- android:textStyle="bold"/>
-
- <com.cyanogenmod.eleven.widgets.RepeatingImageButton
- android:id="@+id/action_button_next"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_toRightOf="@id/audio_player_total_time"
- android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_next" />
-
- <!-- divider -->
- <View
- android:id="@+id/action_button_right_top_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentLeft="true"
- android:layout_above="@id/audio_player_total_time"
- android:background="@color/now_playing_divider" />
-
- <!-- divider -->
- <View
- android:id="@+id/action_button_right_bottom_divider"
- android:layout_height="@dimen/audio_player_divider_height"
- android:layout_width="@dimen/audio_player_divider_length"
- android:layout_marginLeft="@dimen/audio_player_divider_horizontal_offset"
- android:layout_alignParentLeft="true"
- android:layout_below="@id/audio_player_total_time"
- android:background="@color/now_playing_divider" />
-
- <com.cyanogenmod.eleven.widgets.QueueButton
- android:id="@+id/action_button_queue"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_above="@id/action_button_right_top_divider"
- android:layout_alignRight="@id/action_button_next"
- android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_queue"
- android:focusable="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_queue_icon" />
-
- <com.cyanogenmod.eleven.widgets.RepeatButton
- android:id="@+id/action_button_repeat"
- android:layout_width="@dimen/audio_player_controls_end_button_width"
- android:layout_height="@dimen/audio_player_controls_end_button_height"
- android:layout_below="@id/action_button_right_bottom_divider"
- android:layout_alignRight="@id/action_button_next"
- android:layout_marginRight="@dimen/audio_player_controls_end_button_half_width"
- android:contentDescription="@string/accessibility_repeat"
- android:focusable="true"
- android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_repeat_all" />
-
- </RelativeLayout>
-
- </RelativeLayout>
+ <include layout="@layout/main_playback_controls" />
</LinearLayout>