diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-01-19 17:57:53 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-01-19 17:57:53 -0800 |
| commit | 3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394 (patch) | |
| tree | 138459463090a88006035162b3886e483f21ce18 /res | |
| parent | 328cd16b9f5f084adc4e64a2744b2e424a2478fd (diff) | |
| parent | d5758b2ec0edfc257bab18dd7cab572e2e02dbbe (diff) | |
| download | dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.gz dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.bz2 dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.zip | |
Merge branch 'master' into DLNA
Conflicts:
AndroidManifest.xml
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/select_album_header.xml | 20 | ||||
| -rw-r--r-- | res/values-large/integers.xml | 1 | ||||
| -rw-r--r-- | res/values/integers.xml | 1 |
3 files changed, 12 insertions, 10 deletions
diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml index abc16e58..19464103 100644 --- a/res/layout/select_album_header.xml +++ b/res/layout/select_album_header.xml @@ -3,16 +3,6 @@ android:id="@+id/select_album_header" android:layout_width="fill_parent" android:layout_height="wrap_content"> - - <ImageView - android:id="@+id/select_album_art" - android:layout_width="@dimen/AlbumArt.Header" - android:layout_height="@dimen/AlbumArt.Header" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_marginRight="10dip" - android:scaleType="fitCenter" - android:contentDescription="@null"/> <LinearLayout android:id="@+id/select_album_text_layout" @@ -109,6 +99,16 @@ style="@style/BasicButton" android:layout_gravity="center_vertical"/> </LinearLayout> + + <ImageView + android:id="@+id/select_album_art" + android:layout_width="@dimen/AlbumArt.Header" + android:layout_height="@dimen/AlbumArt.Header" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_marginRight="10dip" + android:scaleType="fitCenter" + android:contentDescription="@null"/> </RelativeLayout> diff --git a/res/values-large/integers.xml b/res/values-large/integers.xml index 93883e2a..be82d55a 100644 --- a/res/values-large/integers.xml +++ b/res/values-large/integers.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="Grid.Columns">3</integer>
+ <integer name="TextDescriptionLength">10</integer>
</resources>
\ No newline at end of file diff --git a/res/values/integers.xml b/res/values/integers.xml index 729cf1cd..de6c6067 100644 --- a/res/values/integers.xml +++ b/res/values/integers.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="Grid.Columns">2</integer>
+ <integer name="TextDescriptionLength">5</integer>
</resources>
\ No newline at end of file |