Merge "Fix 3024528: Initial implementation of owner info to enable dogfooding"

This commit is contained in:
Jim Miller
2010-10-14 15:55:04 -07:00
committed by Android (Google) Code Review
4 changed files with 147 additions and 3 deletions

56
res/layout/ownerinfo.xml Normal file
View File

@@ -0,0 +1,56 @@
<?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.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:paddingBottom="3dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
<CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android_layout_marginTop="20dip"
android:text="@string/show_owner_info_on_lockscreen_label"
/>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android_layout_marginTop="20dip"
android:scrollbars="vertical" >
<EditText android:id="@+id/owner_info_edit_text"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="2"
android:lines="4"
android:maxLines="4"
/>
<View
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
/>
</LinearLayout>
</LinearLayout>