openlp
/
android
mirror of https://gitlab.com/openlp/android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge issues

This commit is contained in:
Tim Bentley 2016-01-10 19:33:46 +00:00
parent 49e48adc54
commit cc99cb6a2b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/res/layout/blank_display_dialog.xml
View File

@ -7,7 +7,7 @@
android:layout_height="fill_parent"
android:weightSum="1">
<TextView
android:layout_width="315dp"
android:layout_width="314dp"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/display_blank_summary"
@ -15,18 +15,18 @@
android:textStyle="bold|italic"
android:textSize="40px"
android:height="70px"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"/>
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/display_reset"
android:id="@+id/buttonReset"
android:textSize="20sp"
android:height="30dp"
android:height="40dp"
android:clickable="true"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"/>
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -35,8 +35,8 @@
android:textSize="20sp"
android:height="40dp"
android:clickable="true"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"/>
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -45,8 +45,8 @@
android:textSize="20sp"
android:height="40dp"
android:clickable="true"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"/>
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -55,6 +55,6 @@
android:textSize="20sp"
android:height="40dp"
android:clickable="true"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"/>
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" />
</LinearLayout>