Subversion Repositories ES

Compare Revisions

Last modification

Ignore whitespace Rev 5 → Rev 4

/trunk/res/xml/default_values.xml
File deleted
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: raw/main_new.xml
===================================================================
--- raw/main_new.xml (revision 5)
+++ raw/main_new.xml (nonexistent)
@@ -1,40 +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="fill_parent"
- android:layout_height="fill_parent"
- >
-
-
-<TextView
- style="@android:style/TextAppearance.Large"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Android Einheiten Umrechner"
- />
-
-<Button
- android:id="@+id/sf_starte_menue01"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/activity_length" />
-
-<Button
- android:id="@+id/sf_starte_menue02"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/activity_temperatures" />
-
-<Button
- android:id="@+id/sf_starte_menue03"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/activity_currencies" />
-
-<ImageView
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_gravity="center_horizontal"
- android:src="@drawable/aum" />
-
-</LinearLayout>
/raw/main_new.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: values/arrays.xml
===================================================================
--- values/arrays.xml (revision 5)
+++ values/arrays.xml (nonexistent)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-
- <array name="cur_display">
- <item>CHF</item>
- <item>EUR</item>
- <item>DOLLAR</item>
- </array>
-
- <array name="cur_values">
- <item>CHF</item>
- <item>EUR</item>
- <item>DOL</item>
- </array>
-
- <array name="tem_display">
- <item>Celsius</item>
- <item>Fahrenheit</item>
- <item>Kelvin</item>
- </array>
-
- <array name="tem_values">
- <item>CEL</item>
- <item>FAH</item>
- <item>KEL</item>
- </array>
-
- <array name="mas_display">
- <item>Meter</item>
- <item>Zoll (inch)</item>
- <item>Kilometer</item>
- <item>Meile</item>
- </array>
-
- <array name="mas_values">
- <item>met</item>
- <item>inc</item>
- <item>kme</item>
- <item>mle</item>
- </array>
-
- <!-- Used in app/menu examples -->
- <string-array name="entries_list_preference">
- <item>Alpha Option 01</item>
- <item>Beta Option 02</item>
- <item>Charlie Option 03</item>
- </string-array>
-
- <!-- Used in app/menu examples -->
- <string-array name="entryvalues_list_preference">
- <item>alpha</item>
- <item>beta</item>
- <item>charlie</item>
- </string-array>
-</resources>
/values/arrays.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: values/strings.xml
===================================================================
--- values/strings.xml (revision 5)
+++ values/strings.xml (revision 4)
@@ -1,36 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <string name="hello">Hello World, MenuActivity!</string>
<string name="app_name">Converter</string>
- <string name="title">Android Einheiten-Umrechner</string>
-
- <string name="activity_lengths">Längenmasse</string>
- <string name="hello_world"><b>Hello, <i>World!</i></b></string>
-
- <string name="activity_temperatures">Temperaturen</string>
- <string name="dialog_activity_text">Example of how you can use the
- Theme.Dialog theme to make an activity that looks like a
- dialog.</string>
-
- <string name="activity_currencies">Wechselkurse</string>
- <string name="custom_dialog_activity_text">Example of how you can use a
- custom Theme.Dialog theme to make an activity that looks like a
- customized dialog, here with an ugly frame.</string>
-
- <string name="prompt01">Geben Sie den Betrag der Quellwährung ein:</string>
- <string name="prompt02">Geben Sie die Ausgangstemperatur ein:</string>
- <string name="prompt03">Geben Sie das Ausgangsmass ein:</string>
-
- <string name="title_checkbox_preference">Checkbox preference</string>
- <string name="summary_checkbox_preference">This is a checkbox</string>
-
- <string name="title_edittext_preference">Edit text preference</string>
- <string name="summary_edittext_preference">An example that uses an edit text dialog</string>
- <string name="dialog_title_edittext_preference">Enter your favorite animal</string>
-
- <string name="title_list_preference">List preference</string>
- <string name="summary_list_preference">An example that uses a list dialog</string>
- <string name="dialog_title_list_preference">Choose one</string>
-
- <string name="default_value_list_preference">beta</string>
- <string name="default_value_edittext_preference">Default value</string>
</resources>
Index: drawable-hdpi/aum.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/drawable-hdpi/aum.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: drawable-ldpi/aum.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/drawable-ldpi/aum.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: drawable-mdpi/aum.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/drawable-mdpi/aum.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: layout/frm_currency.xml
===================================================================
--- layout/frm_currency.xml (revision 5)
+++ layout/frm_currency.xml (nonexistent)
@@ -1,33 +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="fill_parent"
- android:layout_height="fill_parent"
- >
-
-<TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/prompt01"
- />
-
-<EditText android:id="@+id/et_amount"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:inputType="numberDecimal" />
-
-<Spinner android:id="@+id/sp_s_currencies"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawSelectorOnTop="true"
- android:entries="@array/cur_display"
- android:entryValues="@array/cur_values" />
-
-<Spinner android:id="@+id/sp_t_currencies"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawSelectorOnTop="true"
- android:entries="@array/cur_display"
- android:entryValues="@array/cur_values" />
-
-</LinearLayout>
/layout/frm_currency.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: layout/custom_dialog_activity.xml
===================================================================
--- layout/custom_dialog_activity.xml (revision 5)
+++ layout/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"/>
/layout/custom_dialog_activity.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: layout/frm_temperatures.xml
===================================================================
--- layout/frm_temperatures.xml (revision 5)
+++ layout/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>
/layout/frm_temperatures.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: layout/frm_laengen.xml
===================================================================
--- layout/frm_laengen.xml (revision 5)
+++ layout/frm_laengen.xml (nonexistent)
@@ -1,33 +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="fill_parent"
- android:layout_height="fill_parent"
- >
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/prompt03"
- />
-
- <EditText android:id="@+id/et_maass"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:inputType="numberDecimal" />
-
- <Spinner android:id="@+id/sp_s_maass"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawSelectorOnTop="true"
- android:entries="@array/mas_display"
- android:entryValues="@array/mas_values" />
-
- <Spinner android:id="@+id/sp_t_maass"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawSelectorOnTop="true"
- android:entries="@array/mas_display"
- android:entryValues="@array/mas_values" />
-
-</LinearLayout>
/layout/frm_laengen.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: layout/hello_world.xml
===================================================================
--- layout/hello_world.xml (revision 5)
+++ layout/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"/>
/layout/hello_world.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: layout/dialog_activity.xml
===================================================================
--- layout/dialog_activity.xml (revision 5)
+++ layout/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"/>
/layout/dialog_activity.xml
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: layout/main.xml
===================================================================
--- layout/main.xml (revision 5)
+++ layout/main.xml (revision 4)
@@ -4,17 +4,9 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/title"
- />
-
- <ListView android:id="@id/android:list"
- android:background="#00FF00"
- android:layout_weight="1"
- android:drawSelectorOnTop="false"
- />
-
+<TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/hello"
+ />
</LinearLayout>