WebSVN - ES - Diff - Rev 7 and 13 - /trunk/res/layout/activity


<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:orientation="vertical" android:layout_height="fill_parent"
  android:layout_width="fill_parent">

  <TableLayout android:id="@+id/TableLayout01"
    android:layout_height="wrap_content" android:layout_width="fill_parent"
    android:stretchColumns="1,3" android:shrinkColumns="*"
    android:layout_marginTop="10sp">
    <TableRow android:layout_height="wrap_content">
      <EditText android:layout_column="1"
        android:id="@+id/temperatures_edit_value1" android:inputType="numberSigned|numberDecimal" />
      <TextView android:layout_column="2" android:text="="
        android:gravity="center" android:textSize="25sp" />
      <EditText android:layout_column="3"
        android:id="@+id/temperatures_edit_value2" android:inputType="numberSigned|numberDecimal" />
    </TableRow>
    <TableRow android:layout_height="wrap_content">
      <Spinner android:layout_column="1"
        android:id="@+id/temperatures_spinner_unit1"
        android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"
        android:entryValues="@array/temperature_units_values" />
      <TextView android:layout_column="2" android:text="" />
      <Spinner android:layout_column="3"
        android:id="@+id/temperatures_spinner_unit2"
        android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"
        android:entryValues="@array/temperature_units_values" />
    </TableRow>
  </TableLayout>

  <TextView android:text="@string/temperatures_off_scale"
    android:id="@+id/temperatures_text_off_scale" android:layout_width="wrap_content"
    android:layout_height="wrap_content" android:visibility="invisible" />
  <Button android:text="@string/button_clear" android:id="@+id/temperatures_button_clear"
    android:layout_height="wrap_content" android:layout_width="100sp"
    android:layout_gravity="center_horizontal"></Button>
</LinearLayout>
 

Subversion Repositories ES

(root)/trunk/res/layout/activity_temperatures.xml @ 17 - Rev 7 → 13

Rev 7		Rev 13
1	<?xml version="1.0" encoding="utf-8"?>	1	<?xml version="1.0" encoding="utf-8"?>
2	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"	2	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3	android:orientation="vertical" android:layout_height="fill_parent"	3	android:orientation="vertical" android:layout_height="fill_parent"
4	android:layout_width="fill_parent">	4	android:layout_width="fill_parent">
5		5
6	<TableLayout android:id="@+id/TableLayout01"	6	<TableLayout android:id="@+id/TableLayout01"
7	android:layout_height="wrap_content" android:layout_width="fill_parent"	7	android:layout_height="wrap_content" android:layout_width="fill_parent"
8	android:stretchColumns="1,3" android:shrinkColumns="*"	8	android:stretchColumns="1,3" android:shrinkColumns="*"
9	android:layout_marginTop="10sp">	9	android:layout_marginTop="10sp">
10	<TableRow android:layout_height="wrap_content">	10	<TableRow android:layout_height="wrap_content">
11	<EditText android:layout_column="1"	11	<EditText android:layout_column="1"
12	android:id="@+id/temperatures_edit_value1" android:inputType="numberSigned\|numberDecimal" />	12	android:id="@+id/temperatures_edit_value1" android:inputType="numberSigned\|numberDecimal" />
13	<TextView android:layout_column="2" android:text="="	13	<TextView android:layout_column="2" android:text="="
14	android:gravity="center" android:textSize="25sp" />	14	android:gravity="center" android:textSize="25sp" />
15	<EditText android:layout_column="3"	15	<EditText android:layout_column="3"
16	android:id="@+id/temperatures_edit_value2" android:inputType="numberSigned\|numberDecimal" />	16	android:id="@+id/temperatures_edit_value2" android:inputType="numberSigned\|numberDecimal" />
17	</TableRow>	17	</TableRow>
18	<TableRow android:layout_height="wrap_content">	18	<TableRow android:layout_height="wrap_content">
19	<Spinner android:layout_column="1"	19	<Spinner android:layout_column="1"
20	android:id="@+id/temperatures_spinner_unit1"	20	android:id="@+id/temperatures_spinner_unit1"
21	android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"	21	android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"
22	android:entryValues="@array/temperature_units_values" />	22	android:entryValues="@array/temperature_units_values" />
23	<TextView android:layout_column="2" android:text="" />	23	<TextView android:layout_column="2" android:text="" />
24	<Spinner android:layout_column="3"	24	<Spinner android:layout_column="3"
25	android:id="@+id/temperatures_spinner_unit2"	25	android:id="@+id/temperatures_spinner_unit2"
26	android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"	26	android:drawSelectorOnTop="true" android:entries="@array/temperature_units_display"
27	android:entryValues="@array/temperature_units_values" />	27	android:entryValues="@array/temperature_units_values" />
28	</TableRow>	28	</TableRow>
29	</TableLayout>	29	</TableLayout>
30		30
31	<TextView android:text="@string/temperatures_off_scale"	31	<TextView android:text="@string/temperatures_off_scale"
32	android:id="@+id/temperatures_text_off_scale" android:layout_width="wrap_content"	32	android:id="@+id/temperatures_text_off_scale" android:layout_width="wrap_content"
33	android:layout_height="wrap_content" android:visibility="invisible" />	33	android:layout_height="wrap_content" android:visibility="invisible" />
-		34	<Button android:text="@string/button_clear" android:id="@+id/temperatures_button_clear"
-		35	android:layout_height="wrap_content" android:layout_width="100sp"
-		36	android:layout_gravity="center_horizontal"></Button>
34	</LinearLayout>	37	</LinearLayout>
35		38