Explorar el Código

Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2

Alexander Brakowski hace 10 años
padre
commit
ba8ccf78ce

BIN
res/drawable-xxxhdpi/ic_swipe_action.png


BIN
res/drawable-xxxhdpi/swipe_icon.png


+ 9 - 0
res/layout-land/fragment_statistics.xml

@@ -24,6 +24,15 @@
             android:id="@+id/plot_parent_layout"
             android:layout_weight="0.9">
 
+            <ProgressBar
+                android:id="@+id/progressBar1"
+                style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:visibility="gone"/>
+
             <!-- TITLE LAYOUT -->
             <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:orientation="vertical"

+ 1 - 1
res/layout/profile_manager_list_item_help.xml

@@ -23,7 +23,7 @@
 			android:layout_width="50dp"
 			android:layout_height="wrap_content"
 			android:id="@+id/imageView"
-			android:src="@drawable/swipe_icon"
+			android:src="@drawable/ic_swipe_action"
 			android:layout_alignParentTop="true"
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"