aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-04-29 10:16:56 -0700
committerScott Jackson <daneren2005@gmail.com>2015-04-29 10:16:56 -0700
commit80665e81bec1bee22b1d93d287aa0ca0e23d0079 (patch)
treeaf24b87f5188bb08ccd93a0ed6b1113b87b95ab9 /app/src/main/res
parent0f801b780e82943bde5b3e7d96af1c6b29ba4edc (diff)
parent076d07c655656b6d8bc3e5e3f4e2f8aa3747dd2d (diff)
downloaddsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.tar.gz
dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.tar.bz2
dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.zip
Merge branch 'master' into SlideUpPanel2
Conflicts: app/app.iml app/build.gradle
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/rating.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/res/layout/rating.xml b/app/src/main/res/layout/rating.xml
index 2753ef68..34c25b6b 100644
--- a/app/src/main/res/layout/rating.xml
+++ b/app/src/main/res/layout/rating.xml
@@ -10,6 +10,7 @@
android:layout_height="wrap_content"
android:numStars="5"
android:stepSize="1"
- android:layout_gravity="center_horizontal"/>
+ android:layout_gravity="center_horizontal"
+ style="@android:style/Widget.Holo.RatingBar"/>
</LinearLayout> \ No newline at end of file