Subversion Repositories ES

Compare Revisions

Last modification

Ignore whitespace Rev 6 → Rev 7

/trunk/res/layout/frm_currency.xml
File deleted
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: custom_dialog_activity.xml
===================================================================
--- custom_dialog_activity.xml (revision 6)
+++ custom_dialog_activity.xml (nonexistent)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Demonstrates an activity with a custom dialog theme.
- See corresponding Java code com.android.sdk.app.CustomDialogActivity.java. -->
-
-<!-- This screen consists of a single text field that displays some text. -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="match_parent" android:layout_height="match_parent"
- android:gravity="center_vertical|center_horizontal"
- android:text="@string/custom_dialog_activity_text"/>
/custom_dialog_activity.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: frm_temperatures.xml
===================================================================
--- frm_temperatures.xml (revision 6)
+++ frm_temperatures.xml (nonexistent)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
-
-<TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/prompt02"
- />
-
-<EditText android:id="@+id/et_temperatur"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:inputType="numberDecimal" />
-
-<Spinner android:id="@+id/sp_s_tunit"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawSelectorOnTop="true"
- android:entries="@array/tem_display"
- android:entryValues="@array/tem_values" />
-
-<Spinner android:id="@+id/sp_t_tunit"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawSelectorOnTop="true"
- android:entries="@array/tem_display"
- android:entryValues="@array/tem_values" />
-
-
-</LinearLayout>
/frm_temperatures.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: hello_world.xml
===================================================================
--- hello_world.xml (revision 6)
+++ hello_world.xml (nonexistent)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Demonstrates basic application screen.
- See corresponding Java code com.android.sdk.app.HelloWorld.java. -->
-
-<!-- This screen consists of a single text field that
- displays our "Hello, World!" text. -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="match_parent" android:layout_height="match_parent"
- android:gravity="center_vertical|center_horizontal"
- android:text="@string/hello_world"/>
/hello_world.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: dialog_activity.xml
===================================================================
--- dialog_activity.xml (revision 6)
+++ dialog_activity.xml (nonexistent)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Demonstrates an activity with a dialog theme.
- See corresponding Java code com.android.sdk.app.DialogActivity.java. -->
-
-<!-- This screen consists of a single text field that displays some text. -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
- android:layout_width="match_parent" android:layout_height="match_parent"
- android:gravity="center_vertical|center_horizontal"
- android:text="@string/dialog_activity_text"/>
/dialog_activity.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: activity_temperatures.xml
===================================================================
--- activity_temperatures.xml (nonexistent)
+++ activity_temperatures.xml (revision 7)
@@ -0,0 +1,34 @@
+<?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" />
+</LinearLayout>
/activity_temperatures.xml
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: activity_currencies.xml
===================================================================
--- activity_currencies.xml (nonexistent)
+++ activity_currencies.xml (revision 7)
@@ -0,0 +1,30 @@
+<?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/currencies_edit_value1" android:inputType="numberDecimal" />
+ <TextView android:layout_column="2" android:text="="
+ android:gravity="center" android:textSize="25sp" />
+ <EditText android:layout_column="3"
+ android:id="@+id/currencies_edit_value2" android:inputType="numberDecimal" />
+ </TableRow>
+ <TableRow android:layout_height="wrap_content">
+ <Spinner android:layout_column="1"
+ android:id="@+id/currencies_spinner_unit1"
+ android:drawSelectorOnTop="true" android:entries="@array/currency_units_display"
+ android:entryValues="@array/currency_units_values" />
+ <TextView android:layout_column="2" android:text="" />
+ <Spinner android:layout_column="3"
+ android:id="@+id/currencies_spinner_unit2"
+ android:drawSelectorOnTop="true" android:entries="@array/currency_units_display"
+ android:entryValues="@array/currency_units_values" />
+ </TableRow>
+ </TableLayout>
+</LinearLayout>
/activity_currencies.xml
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property