Changeset 14310 for issm/trunk/src/android/ISSM_Visual/res/layout/activity_issmvisual.xml

Timestamp:

02/04/13 08:01:04 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 14308

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/android/ISSM_Visual/res/layout/activity_issmvisual.xml (modified) (2 diffs)

issm/trunk/src/android/ISSM_Visual/res/layout/activity_issmvisual.xml

@@ -15 +15 @@
 
     <TextView
-        android:id="@+id/status"
+        android:id="@+id/value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@+id/seekBar"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="16dp"
-        android:text="Status: " />
+        android:layout_marginBottom="15dp"
+        android:text="alpha value = 0" />
 
     <FrameLayout
@@ -31 +31 @@
         android:layout_above="@+id/value"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="16dp" >
+        android:layout_marginBottom="12dp" >
     </FrameLayout>
 
-    <TextView
-        android:id="@+id/value"
+    <Button
+        android:id="@+id/button1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/status"
-        android:layout_alignRight="@+id/status"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="16dp"
-        android:text="Value: " />
+        android:layout_above="@+id/seekBar"
+        android:layout_alignParentRight="true"
+        android:text="Reset" />
 
 </RelativeLayout>