Merge "LDPI layout changes" into gingerbread

This commit is contained in:
Steve Kondik 2011-03-06 21:55:03 +00:00 committed by Gerrit Code Review
commit b891e940c7
27 changed files with 3 additions and 155 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 896 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 507 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 776 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 809 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 565 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 777 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1003 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -70,7 +70,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/carrier"
android:layout_marginTop="20dip"
android:layout_marginTop="22dip"
android:layout_marginLeft="20dip"
android:paddingBottom="2dip"
>
@ -80,7 +80,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="none"
android:textSize="70sp"
android:textSize="68sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowColor="#C0000000"
android:shadowDx="0"

View File

@ -1,68 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:padding="8dip"
>
<ImageView android:id="@+id/icon"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/usb_android" />
<TextView android:id="@+id/banner"
android:layout_centerHorizontal="true"
android:layout_below="@id/icon"
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="24sp"
android:gravity="center"
android:text="@string/usb_storage_title" />
<TextView android:id="@+id/message"
android:layout_below="@id/banner"
android:layout_marginTop="10dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:gravity="center"
android:text="@string/usb_storage_message" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="6dip"
>
<Button android:id="@+id/mount_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="18dip"
android:paddingRight="18dip"
android:text="@string/usb_storage_button_mount"
/>
<Button android:id="@+id/unmount_button"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="18dip"
android:paddingRight="18dip"
android:text="@string/usb_storage_stop_button_mount"
/>
<ProgressBar android:id="@+id/progress"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
style="?android:attr/progressBarStyle"
/>
</RelativeLayout>
</RelativeLayout>

View File

@ -35,7 +35,7 @@
>
<com.android.systemui.statusbar.powerwidget.PowerWidget android:id="@+id/exp_power_stat"
android:layout_width="match_parent"
android:layout_height="42dip"
android:layout_height="45dip"
/>
<LinearLayout

View File

@ -1,84 +0,0 @@
<?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.
-->
<resources>
<string name="application_terminal">Terminal Emulator</string>
<string name="preferences">Preferences</string>
<string name="reset">Reset term</string>
<string name="send_email">Email to</string>
<string name="special_keys">Special keys</string>
<string name="toggle_soft_keyboard">Toggle soft keyboard</string>
<string name="edit_text">Edit text</string>
<string name="select_text">Select text</string>
<string name="copy_all">Copy all</string>
<string name="paste">Paste</string>
<!-- Preference dialog -->
<string name="screen_preferences">Screen</string>
<string name="title_statusbar_preference">Status bar</string>
<string name="summary_statusbar_preference">Show/hide status bar.</string>
<string name="dialog_title_statusbar_preference">Status bar</string>
<string name="title_cursorstyle_preference">Cursor style</string>
<string name="summary_cursorstyle_preference">Choose cursor style.</string>
<string name="dialog_title_cursorstyle_preference">Cursor style</string>
<string name="title_cursorblink_preference">Cursor blink</string>
<string name="summary_cursorblink_preference">Choose cursor blink.</string>
<string name="dialog_title_cursorblink_preference">Cursor blink</string>
<string name="text_preferences">Text</string>
<string name="title_fontsize_preference">Font size</string>
<string name="summary_fontsize_preference">Choose character height in points.</string>
<string name="dialog_title_fontsize_preference">Font size</string>
<string name="title_color_preference">Colors</string>
<string name="summary_color_preference">Choose text color.</string>
<string name="dialog_title_color_preference">Text color</string>
<string name="keyboard_preferences">Keyboard</string>
<string name="title_controlkey_preference">Control key</string>
<string name="summary_controlkey_preference">Choose control key.</string>
<string name="dialog_title_controlkey_preference">Control key</string>
<string name="title_ime_preference">Input method</string>
<string name="summary_ime_preference">Choose input method for soft keyboard.</string>
<string name="dialog_title_ime_preference">Input method</string>
<string name="shell_preferences">Shell</string>
<string name="title_shell_preference">Command line</string>
<string name="summary_shell_preference">Specify the shell command line.</string>
<string name="dialog_title_shell_preference">Shell</string>
<string name="title_initialcommand_preference">Initial command</string>
<string name="summary_initialcommand_preference">Sent to the shell when it starts.</string>
<string name="dialog_title_initialcommand_preference">Initial Command</string>
<!-- Don't localize these default values -->
<string name="default_value_statusbar_preference">0</string>
<string name="default_value_cursorstyle_preference">0</string>
<string name="default_value_cursorblink_preference">0</string>
<string name="default_value_fontsize_preference">12</string>
<string name="default_value_color_preference">1</string>
<string name="default_value_controlkey_preference">0</string>
<string name="default_value_ime_preference">0</string>
<string name="default_value_shell_preference">/system/bin/sh -</string>
<string name="default_value_initialcommand_preference">export PATH=/data/local/bin:$PATH</string>
</resources>