Merge branch 'master' into bug3794

This commit is contained in:
Axel Uhl committed 2016-07-20 09:51:36 +02:00
commit f0c75e7a13
2 files changed
+6 -4

No files matched your search

@@ -4,7 +4,7 @@ import java.util.Arrays;
import java.util.List;
public interface SuggestedCourseAreaNames {
static final List<String> suggestedCourseAreaNames = Arrays.asList("Alpha", "Bravo", "Charlie", "Delta", "Echo",
"Foxtrott", "Golf", "Hotel", "India", "Juliett", "Kilo", "Stadium", "Offshore", "TV");
static final List<String> suggestedCourseAreaNames = Arrays.asList("Alpha", "Alfa", "Bravo", "Charlie", "Delta", "Echo",
"Foxtrot", "Golf", "Hotel", "India", "Juliett", "Juliet", "Kilo", "Stadium", "Offshore", "TV", "Media");
}
@@ -22,8 +22,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:gravity="center"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/toolbar_text_color"
android:textSize="16sp" />
@@ -32,8 +33,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:gravity="center"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/toolbar_text_color"
android:textSize="12sp" />
</LinearLayout>