norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into lp-design

Browse Source 
Conflicts:
	res/values/theme.xml
This commit is contained in:
Adrian Ulrich 2015-04-05 21:27:58 +02:00
commit 4f6a507b6c
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
res/layout/full_playback_alt.xml
View File

@ -39,10 +39,12 @@ THE SOFTWARE.
<TableRow>
<TextView
android:text="@string/_title"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView
android:id="@+id/title"
android:textColor="@color/playback_color"
android:textStyle="bold" />
<TextView
android:id="@+id/queue_pos"
@ -52,58 +54,66 @@ THE SOFTWARE.
<TableRow>
<TextView
android:text="@string/_artist"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/artist" />
<TextView android:id="@+id/artist" android:textColor="@color/playback_color"/>
</TableRow>
<TableRow>
<TextView
android:text="@string/_album"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/album" />
<TextView android:id="@+id/album" android:textColor="@color/playback_color"/>
</TableRow>
<TableRow>
<TextView
android:text="@string/_genre"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/genre" />
<TextView android:id="@+id/genre" android:textColor="@color/playback_color"/>
</TableRow>
<TableRow>
<TextView
android:text="@string/_track"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/track" />
<TextView android:id="@+id/track" android:textColor="@color/playback_color"/>
</TableRow>
<TableRow>
<TextView
android:text="@string/_year"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/year" />
<TextView android:id="@+id/year" android:textColor="@color/playback_color"/>
</TableRow>
<TableRow>
<TextView
android:text="@string/_composer"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/composer" />
<TextView android:id="@+id/composer" android:textColor="@color/playback_color"/>
</TableRow>
<TableRow>
<TextView
android:text="@string/_format"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/format" />
<TextView android:id="@+id/format" android:textColor="@color/playback_color"/>
</TableRow>
<TableRow>
<TextView
android:text="@string/_replaygain"
android:textColor="@color/playback_color"
android:paddingRight="5dip"
android:gravity="right" />
<TextView android:id="@+id/replaygain" />
<TextView android:id="@+id/replaygain" android:textColor="@color/playback_color"/>
</TableRow>
<LinearLayout android:id="@+id/controls_top">
<TextView

2
res/values/theme.xml
View File

@ -25,6 +25,8 @@ THE SOFTWARE.
<color name="divider_color">#f444</color>
<color name="overlay_color">#a000</color>
<color name="float_color">#f222</color>
<!-- color to use in full_playback text, set to bright_foreground_disabled_holo_light //-->
<color name="playback_color">#ffb2b2b2</color>
<!-- styles -->
<style name="Dialog" parent="android:Theme.Holo.Dialog" />