- LengthActivity: Use three-column TableLayout (a11y) - Added length conversion for in/km/m/mi - Disabled unused default_values.xml
/trunk/res/values/arrays.xml |
---|
26,19 → 26,20 |
<item>KEL</item> |
</array> |
<array name="mas_display"> |
<item>Meter</item> |
<item>Zoll (inch)</item> |
<item>Kilometer</item> |
<item>Meile</item> |
</array> |
<string-array name="length_units_display"> |
<item>in (inch)</item> |
<item>m (meter)</item> |
<item>mi (mile)</item> |
<item>km (kilometer)</item> |
</string-array> |
<array name="mas_values"> |
<item>met</item> |
<item>inc</item> |
<item>kme</item> |
<item>mle</item> |
</array> |
<string-array name="length_units_values"> |
<!-- TODO: Must not be "in", why? --> |
<item>inch</item> |
<item>m</item> |
<item>mi</item> |
<item>km</item> |
</string-array> |
<!-- Used in app/menu examples --> |
<string-array name="entries_list_preference"> |
/trunk/res/values/strings.xml |
---|
18,7 → 18,6 |
<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> |
/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: xml/default_values_old.xml |
=================================================================== |
--- xml/default_values_old.xml (nonexistent) |
+++ xml/default_values_old.xml (revision 6) |
@@ -0,0 +1,44 @@ |
+<?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. |
+--> |
+ |
+<!-- This is a primitive example showing how to set default values for preferences. |
+ See DefaultValues.java for more information. --> |
+<PreferenceScreen |
+ xmlns:android="http://schemas.android.com/apk/res/android"> |
+ |
+ <CheckBoxPreference |
+ android:key="default_toggle" |
+ android:defaultValue="true" |
+ android:title="@string/title_checkbox_preference" |
+ android:summary="@string/summary_checkbox_preference" /> |
+ |
+ <EditTextPreference |
+ android:key="default_edittext" |
+ android:defaultValue="@string/default_value_edittext_preference" |
+ android:title="@string/title_edittext_preference" |
+ android:summary="@string/summary_edittext_preference" |
+ android:dialogTitle="@string/dialog_title_edittext_preference" /> |
+ |
+ <ListPreference |
+ android:key="default_list" |
+ android:defaultValue="@string/default_value_list_preference" |
+ android:title="@string/title_list_preference" |
+ android:summary="@string/summary_list_preference" |
+ android:entries="@array/entries_list_preference" |
+ android:entryValues="@array/entryvalues_list_preference" |
+ android:dialogTitle="@string/dialog_title_list_preference" /> |
+ |
+</PreferenceScreen> |
/xml/default_values_old.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+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/activity_lengths.xml |
=================================================================== |
--- layout/activity_lengths.xml (nonexistent) |
+++ layout/activity_lengths.xml (revision 6) |
@@ -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="fill_parent" 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/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/edit_value2" |
+ android:inputType="numberDecimal" /> |
+ </TableRow> |
+ <TableRow android:layout_height="wrap_content"> |
+ <Spinner android:layout_column="1" android:id="@+id/spinner_unit1" |
+ android:drawSelectorOnTop="true" android:entries="@array/length_units_display" |
+ android:entryValues="@array/length_units_values" /> |
+ <TextView android:layout_column="2" android:text="" /> |
+ <Spinner android:layout_column="3" android:id="@+id/spinner_unit2" |
+ android:drawSelectorOnTop="true" android:entries="@array/length_units_display" |
+ android:entryValues="@array/length_units_values" /> |
+ |
+ </TableRow> |
+ </TableLayout> |
+</LinearLayout> |
/layout/activity_lengths.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |