diff options
| author | Andrew Dolgov <[email protected]> | 2014-10-15 15:49:45 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-10-15 15:49:45 +0400 |
| commit | 293454dc14153ef5f3a9b30fbffc8c0cd95b9410 (patch) | |
| tree | 15aa19db78534a03b2299b3002949d61d537df22 /res/layout | |
| parent | a2e8246a4e087e6394eb20860aa10dec77b071ab (diff) | |
| parent | 179296966f8d7db0a31e32254ff0effd0a51bbea (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Comics-Reader
Conflicts:
res/values/styles.xml
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/activity_view_comic.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/layout/activity_view_comic.xml b/res/layout/activity_view_comic.xml index 62a5e45..b20b86b 100644 --- a/res/layout/activity_view_comic.xml +++ b/res/layout/activity_view_comic.xml @@ -1,9 +1,10 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/FrameLayout2"
+ android:background="?attr/viewComicsBackground"
android:layout_width="match_parent"
android:layout_height="match_parent" >
-
+
<FrameLayout
android:id="@+id/comics_pager_container"
android:layout_width="match_parent"
|