merge heads

This commit is contained in:
Jimmy Shih
2012-04-02 14:49:12 -07:00
parent 0bd4461c32
commit 2d05ff98ca
75 changed files with 783 additions and 794 deletions
@@ -49,8 +49,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:autoText="true"
android:capitalize="words"
android:inputType="textAutoCorrect|textCapWords"
android:selectAllOnFocus="true"
android:hint="@string/marker_detail_marker_name"
android:imeOptions="actionNext"/>
@@ -78,8 +77,7 @@ limitations under the License.
android:layout_width="fill_parent"
android:layout_height="0dp"
android:singleLine="false"
android:autoText="true"
android:capitalize="sentences"
android:inputType="textAutoCorrect|textCapSentences"
android:selectAllOnFocus="true"
android:minLines="5"
android:maxLines="50"