summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2011-01-29 09:00:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-29 09:00:27 -0800
commit4252d72dbeb9b8b09ce137725b33c29625f87d42 (patch)
tree5c42624e9e0cc85df25452010f3e8d104a4471eb /res
parent43dd84eef45d9a4acde8bf02c856478484932615 (diff)
parent48e3e617b6a74f79f655cd97d09a82e316d1e2ef (diff)
downloadandroid_packages_apps_Tag-4252d72dbeb9b8b09ce137725b33c29625f87d42.tar.gz
android_packages_apps_Tag-4252d72dbeb9b8b09ce137725b33c29625f87d42.tar.bz2
android_packages_apps_Tag-4252d72dbeb9b8b09ce137725b33c29625f87d42.zip
am 48e3e617: am 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some more UI stuff. Add text type." into gingerbread
* commit '48e3e617b6a74f79f655cd97d09a82e316d1e2ef': Don't crash when not selecting a contact. Fix some more UI stuff. Add text type.
Diffstat (limited to 'res')
-rw-r--r--res/layout/tag_edit_text.xml39
1 files changed, 39 insertions, 0 deletions
diff --git a/res/layout/tag_edit_text.xml b/res/layout/tag_edit_text.xml
new file mode 100644
index 0000000..c316e16
--- /dev/null
+++ b/res/layout/tag_edit_text.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2010 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:padding="8dip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/title"
+ android:text="@string/tag_text"
+ style="@style/record_title"
+ android:layout_alignParentTop="true"
+ />
+
+ <EditText
+ android:id="@+id/value"
+ android:inputType="textShortMessage|textCapSentences"
+ android:layout_below="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+</RelativeLayout>
+
+