OpenLP

Merge lp:~trb143/openlp/Android_Search into lp:openlp/android2

  1. Android_Search
  2. Merge into android2
Proposed by Tim Bentley
Status: Work in progress
Proposed branch: lp:~trb143/openlp/Android_Search
Merge into: lp:openlp/android2
Diff against target: 81 lines (+13/-13)
2 files modified
app/build.gradle (+1/-1)
app/src/main/res/layout/blank_display_dialog.xml (+12/-12)
To merge this branch: bzr merge lp:~trb143/openlp/Android_Search
Reviewer Review Type Date Requested Status
OpenLP Core Pending
Review via email: mp+294735@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

54. By Tim Bentley

Updates

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/build.gradle'
2--- app/build.gradle 2016-01-11 20:02:36 +0000
3+++ app/build.gradle 2016-05-15 17:15:18 +0000
4@@ -10,7 +10,7 @@
5 applicationId "org.openlp.android2"
6 minSdkVersion 15
7 targetSdkVersion 22
8- versionCode 5
9+ versionCode 6
10 versionName "2.0"
11 }
12 android {
13
14=== modified file 'app/src/main/res/layout/blank_display_dialog.xml'
15--- app/src/main/res/layout/blank_display_dialog.xml 2016-01-11 20:02:36 +0000
16+++ app/src/main/res/layout/blank_display_dialog.xml 2016-05-15 17:15:18 +0000
17@@ -7,7 +7,7 @@
18 android:layout_height="fill_parent"
19 android:weightSum="1">
20 <TextView
21- android:layout_width="314dp"
22+ android:layout_width="315dp"
23 android:layout_height="wrap_content"
24 android:textAppearance="?android:attr/textAppearanceMedium"
25 android:text="@string/display_blank_summary"
26@@ -15,18 +15,18 @@
27 android:textStyle="bold|italic"
28 android:textSize="40px"
29 android:height="70px"
30- android:layout_marginTop="10dp"
31- android:layout_marginBottom="10dp" />
32+ android:layout_marginTop="10dp"
33+ android:layout_marginBottom="10dp"/>
34 <RadioButton
35 android:layout_width="match_parent"
36 android:layout_height="wrap_content"
37 android:text="@string/display_reset"
38 android:id="@+id/buttonReset"
39 android:textSize="20sp"
40- android:height="40dp"
41+ android:height="30dp"
42 android:clickable="true"
43- android:layout_marginTop="20dp"
44- android:layout_marginBottom="20dp" />
45+ android:layout_marginTop="20dp"
46+ android:layout_marginBottom="20dp"/>
47 <RadioButton
48 android:layout_width="match_parent"
49 android:layout_height="wrap_content"
50@@ -35,8 +35,8 @@
51 android:textSize="20sp"
52 android:height="40dp"
53 android:clickable="true"
54- android:layout_marginTop="20dp"
55- android:layout_marginBottom="20dp" />
56+ android:layout_marginTop="20dp"
57+ android:layout_marginBottom="20dp"/>
58 <RadioButton
59 android:layout_width="match_parent"
60 android:layout_height="wrap_content"
61@@ -45,8 +45,8 @@
62 android:textSize="20sp"
63 android:height="40dp"
64 android:clickable="true"
65- android:layout_marginTop="20dp"
66- android:layout_marginBottom="20dp" />
67+ android:layout_marginTop="20dp"
68+ android:layout_marginBottom="20dp"/>
69 <RadioButton
70 android:layout_width="match_parent"
71 android:layout_height="wrap_content"
72@@ -55,6 +55,6 @@
73 android:textSize="20sp"
74 android:height="40dp"
75 android:clickable="true"
76- android:layout_marginTop="20dp"
77- android:layout_marginBottom="20dp" />
78+ android:layout_marginTop="20dp"
79+ android:layout_marginBottom="20dp"/>
80 </LinearLayout>
81\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: