diff options
| author | Jim Miller <jaggies@google.com> | 2010-12-01 17:01:03 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2010-12-01 18:01:34 -0800 |
| commit | 4b296497ea819c74ad63ab3028e958fd4c800f8a (patch) | |
| tree | 428d5709f3092d7f5aad4dcece1d57678ce818f2 | |
| parent | 455a93fa5c34f80731cfcce06a93f0619170f0ea (diff) | |
| download | packages_apps_settings-4b296497ea819c74ad63ab3028e958fd4c800f8a.zip packages_apps_settings-4b296497ea819c74ad63ab3028e958fd4c800f8a.tar.gz packages_apps_settings-4b296497ea819c74ad63ab3028e958fd4c800f8a.tar.bz2 | |
Fix 3201870: Minor layout tweaks to match pixel perfect.
Change-Id: I3ac587ec2dea43cdf2bd4357a48f75e9b41f440a
| -rw-r--r-- | res/layout/ownerinfo.xml | 47 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 26 insertions, 23 deletions
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml index 16e7a85..469fc50 100644 --- a/res/layout/ownerinfo.xml +++ b/res/layout/ownerinfo.xml @@ -17,40 +17,41 @@ 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" > + <View + android:paddingTop="53dip" + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="#ff404040" + /> + <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:layout_height="64dip" + android:gravity="center_vertical" android:text="@string/show_owner_info_on_lockscreen_label" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:attr/textColorSecondary" /> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" + <View 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" + android:layout_height="1dip" + android:background="#ff404040" /> - <View - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - /> - - </LinearLayout> + <EditText android:id="@+id/owner_info_edit_text" + android:layout_width="480dip" + android:layout_height="wrap_content" + android:layout_marginLeft="62dip" + android:layout_marginTop="40dip" + android:gravity="top" + android:hint="@string/owner_info_settings_edit_text_hint" + android:lines="8" + android:maxLines="8" + /> </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 413807c..3523b76 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -570,6 +570,8 @@ <string name="owner_info_settings_title">Owner info</string> <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]--> <string name="owner_info_settings_summary">Set or disable showing owner info on lock screen</string> + <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] --> + <string name="owner_info_settings_edit_text_hint">Enter text to display on the lock screen</string> <!-- Main Settings screen setting option title for the item to take you the security and location screen --> <string name="security_settings_title">Location & security</string> <!-- Location & security settings screen title --> |