Merge branch 'ics' of github.com:PecanCM/android_device_lge_p350 into ics
diff --git a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_password_portrait.xml b/overlay/frameworks/base/core/res/res/layout/keyguard_screen_password_portrait.xml
deleted file mode 100644
index 94f3d31..0000000
--- a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_password_portrait.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/root"
-    android:gravity="center_horizontal">
-
-    <!-- layout_marginBottom reduced from 18dip to 2dip -->
-    <com.android.internal.widget.DigitalClock android:id="@+id/time"
-        android:layout_marginBottom="2dip"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
-        android:layout_gravity="right">
-
-        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on
-        top of the other. Hence the redundant layout... -->
-        <!-- layout_marginBottom reduced from 6dip to 2dip -->
-        <TextView android:id="@+id/timeDisplayBackground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginBottom="2dip"
-            android:textColor="@*android:color/lockscreen_clock_background"
-            />
-
-        <!-- layout_marginBottom reduced from 6dip to 2dip -->
-        <TextView android:id="@+id/timeDisplayForeground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginBottom="2dip"
-            android:textColor="@color/lockscreen_clock_foreground"
-            />
-
-    </com.android.internal.widget.DigitalClock>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin">
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            />
-
-        <TextView
-            android:id="@+id/alarm_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dip"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            android:drawablePadding="4dip"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/status1"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-        android:drawablePadding="4dip"
-        />
-
-    <!-- Password entry field -->
-    <!-- Note: the entire container is styled to look like the edit field,
-         since the backspace/IME switcher looks better inside -->
-    <!-- added android:layout_height="60dip" to limit the height of password entry field-->
-    <LinearLayout
-        android:layout_gravity="center_vertical|fill_horizontal"
-        android:orientation="horizontal"
-        android:background="@drawable/lockscreen_password_field_dark"
-        android:layout_height="60dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip">
-
-    <!-- textSize of password letters reduced from 36sp to 32sp -->
-        <EditText android:id="@+id/passwordEntry"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center_horizontal"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/keyguard_lockscreen_pin_margin_left"
-            android:singleLine="true"
-            android:textStyle="normal"
-            android:inputType="textPassword"
-            android:textSize="32sp"
-            android:background="@null"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffffff"
-            android:imeOptions="actionDone"
-            android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"
-            />
-
-        <!-- This delete button is only visible for numeric PIN entry -->
-        <ImageButton android:id="@+id/pinDel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@android:drawable/ic_input_delete"
-            android:clickable="true"
-            android:padding="8dip"
-            android:layout_gravity="center_vertical"
-            android:background="?android:attr/selectableItemBackground"
-            android:visibility="gone"
-            />
-
-        <ImageView android:id="@+id/switch_ime_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_lockscreen_ime"
-            android:clickable="true"
-            android:padding="8dip"
-            android:layout_gravity="center"
-            android:background="?android:attr/selectableItemBackground"
-            android:visibility="gone"
-            />
-
-    </LinearLayout>
-
-    <!-- Numeric keyboard -->
-    <!-- Numeric keyboard key margins reduced from 4dip to 2dip -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
-        android:paddingTop="2dip"
-        android:paddingBottom="2dip"
-        android:background="#40000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_ics"
-        android:visibility="gone"
-        android:clickable="true"
-    />
-
-    <TextView
-        android:id="@+id/carrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-        android:drawablePadding="4dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        />
-
-    <!-- marginTop reduced from 4dip to 1dip -->
-    <!-- drawablePadding reduced from 4dip to 1dip -->
-    <Button
-        android:id="@+id/emergencyCallButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="1dip"
-        android:layout_gravity="center_horizontal"
-        android:drawableLeft="@*android:drawable/lockscreen_emergency_button"
-        style="?android:attr/buttonBarButtonStyle"
-        android:drawablePadding="1dip"
-        android:text="@*android:string/lockscreen_emergency_call"
-        android:visibility="gone"
-        />
-
-    <!-- Music transport control -->
-    <include android:id="@+id/transport"
-        layout="@layout/keyguard_transport_control"
-        android:layout_row="0"
-        android:layout_column="0"
-        android:layout_rowSpan="3"
-        android:layout_columnSpan="1"
-        android:layout_gravity="fill"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        />
-
-    <!-- Area to overlay FaceLock -->
-    <TextView android:id="@+id/faceLockAreaView"
-        android:visibility="invisible"
-        android:layout_row="3"
-        android:layout_column="0"
-        android:layout_rowSpan="2"
-        android:layout_columnSpan="1"
-        android:layout_gravity="fill"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        android:background="@color/facelock_color_background"
-    />
-
-</GridLayout>
diff --git a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
deleted file mode 100644
index ee1a201..0000000
--- a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<!-- This is the general lock screen which shows information about the
-  state of the device, as well as instructions on how to get past it
-  depending on the state of the device.  It is the same for landscape
-  and portrait.-->
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/root"
-    android:gravity="center_horizontal">
-
-    <!-- marginBottom reduced from 12dip to 2dip -->
-    <com.android.internal.widget.DigitalClock android:id="@+id/time"
-        android:layout_marginTop="@dimen/keyguard_lockscreen_status_line_clockfont_top_margin"
-        android:layout_marginBottom="2dip"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
-        android:layout_gravity="right">
-
-        <!-- marginBottom reduced from 6dip to 2dip -->
-        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on
-        top of the other. Hence the redundant layout... -->
-        <TextView android:id="@+id/timeDisplayBackground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginBottom="2dip"
-            android:textColor="@color/lockscreen_clock_background"
-            />
-
-        <!-- marginBottom reduced from 6dip to 2dip -->
-        <TextView android:id="@+id/timeDisplayForeground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_marginBottom="2dip"
-            android:textColor="@color/lockscreen_clock_foreground"
-            android:layout_alignLeft="@id/timeDisplayBackground"
-            android:layout_alignTop="@id/timeDisplayBackground"
-            />
-
-    </com.android.internal.widget.DigitalClock>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin">
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            />
-
-        <TextView
-            android:id="@+id/alarm_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dip"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            android:drawablePadding="4dip"
-            />
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/status1"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-        android:drawablePadding="4dip"
-        />
-
-    <!-- emergency call button shown when sim is PUKd and tab_selector is hidden -->
-    <!-- marginTop reduced from 4dip to 2dip -->
-    <!-- drawablePadding reduced from 4dip to 2dip -->
-    <Button
-        android:id="@+id/emergencyCallButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dip"
-        android:layout_marginRight="16dip"
-        android:layout_gravity="right"
-        android:drawableLeft="@*android:drawable/lockscreen_emergency_button"
-        style="?android:attr/buttonBarButtonStyle"
-        android:drawablePadding="2dip"
-        android:text="@*android:string/lockscreen_emergency_call"
-        android:visibility="gone"
-        />
-
-    <!-- android:layout_marginTop is added to bring the lockscreen up a bit -->
-    <RelativeLayout
-        android:layout_width="match_parent"
-		android:layout_height="400dip"
-		android:layout_marginTop="-15dip"
-		android:layout_alignParentBottom="true">
-		
-    <!-- CyanogenMod Weather Panel -->
-    <RelativeLayout
-        android:id="@+id/weather_panel"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="8dip" >
-
-        <ImageView
-            android:id="@+id/weather_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:paddingLeft="8dip"
-            android:paddingRight="8dip" 
-            android:src="@android:drawable/ic_dialog_alert" />
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/weather_image"
-            android:orientation="horizontal"
-            android:padding="4dip" >
-
-            <TextView
-                android:id="@+id/weather_city"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:layout_alignParentRight="true"
-                android:gravity="right"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textColor="?android:attr/textColorPrimary"/>
-
-            <TextView
-                android:id="@+id/weather_condition"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/weather_city"
-                android:layout_alignParentRight="true"
-                android:gravity="right"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textSize="12sp"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <TextView
-                android:id="@+id/update_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="right"
-                android:layout_below="@id/weather_condition"
-                android:layout_alignParentRight="true"
-                android:textSize="6sp"
-                android:textColor="?android:attr/textColorSecondary" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/weather_temps_panel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/weather_image"
-            android:orientation="horizontal"
-            android:layout_centerVertical="true" >
-
-            <TextView
-                android:id="@+id/weather_temp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:textSize="20sp"
-                android:textColor="?android:attr/textColorPrimary" />
-
-            <View
-                android:id="@+id/weather_divider"
-                android:layout_below="@id/weather_temp"
-                android:layout_width="44dip"
-                android:layout_height="1dip"
-                android:background="@android:drawable/divider_horizontal_dark" />
-
-            <TextView
-                android:id="@+id/weather_low_high"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/weather_divider"
-                android:layout_centerHorizontal="true"
-                android:paddingTop="2dip"
-                android:textSize="12sp"
-                android:textColor="?android:attr/textColorPrimary" />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-    <!-- CyanogenMod Calendar Panel -->
-    <!-- android:layout_marginTop is added to push Calender notifications down -->
-    <LinearLayout
-        android:id="@+id/calendar_panel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="28dip"
-        android:layout_marginTop="65dip"
-        android:gravity="center_vertical"
-        android:paddingLeft="12dip"
-        android:paddingRight="12dip" >
-
-        <ImageView
-            android:layout_width="36dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:src="@drawable/ic_lock_idle_calendar" />
-
-        <View
-            android:layout_width="1dip"
-            android:layout_height="match_parent"
-            android:paddingTop="6dip"
-            android:paddingBottom="6dip"
-            android:background="@android:drawable/divider_horizontal_dark" />
-
-        <RelativeLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="6dip"
-            android:paddingBottom="6dip"
-            android:paddingLeft="4dip" >
-
-            <TextView
-                android:id="@+id/calendar_event_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textSize="14sp"
-                android:textColor="?android:attr/textColorPrimary"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal" />
-
-            <TextView
-                android:id="@+id/calendar_event_details"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/calendar_event_title"
-                android:layout_alignLeft="@id/calendar_event_title"
-                android:textSize="12sp"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:fadingEdge="horizontal"
-                android:textColor="?android:attr/textColorSecondary" />
-
-        </RelativeLayout>
-
-    </LinearLayout>
-
-        <com.android.internal.widget.multiwaveview.MultiWaveView
-            android:id="@+id/unlock_widget"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-
-            android:targetDrawables="@array/lockscreen_targets_with_camera"
-            android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"
-            android:directionDescriptions="@array/lockscreen_direction_descriptions"
-            android:handleDrawable="@drawable/ic_lockscreen_handle"
-            android:waveDrawable="@drawable/ic_lockscreen_outerring"
-            android:outerRadius="@dimen/multiwaveview_target_placement_radius"
-            android:snapMargin="@dimen/multiwaveview_snap_margin"
-            android:hitRadius="@dimen/multiwaveview_hit_radius"
-            android:rightChevronDrawable="@drawable/ic_lockscreen_chevron_right"
-            android:horizontalOffset="0dip"
-            android:verticalOffset="60dip"
-            android:feedbackCount="3"
-            android:vibrationDuration="20"
-            />
-
-        <TextView
-            android:id="@+id/carrier"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="82dip"
-            android:gravity="center_horizontal"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            android:textColor="?android:attr/textColorSecondary"
-            />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        style="?android:attr/buttonBarStyle"
-        android:gravity="center"
-        android:weightSum="2">
-
-        <Button android:id="@+id/emergencyCallButton"
-            android:layout_gravity="center_horizontal"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="?android:attr/buttonBarButtonStyle"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            android:text="@*android:string/lockscreen_emergency_call"
-            android:drawableLeft="@*android:drawable/lockscreen_emergency_button"
-            android:drawablePadding="0dip"
-            android:visibility="gone"
-        />
-
-    </LinearLayout>
-
-    <!-- Music transport control -->
-    <include android:id="@+id/transport"
-        layout="@layout/keyguard_transport_control"
-        android:layout_row="0"
-        android:layout_column="0"
-        android:layout_rowSpan="4"
-        android:layout_columnSpan="1"
-        android:layout_gravity="fill"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        />
-
-</GridLayout>
-
diff --git a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/overlay/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
deleted file mode 100644
index f6a9a68..0000000
--- a/overlay/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!-- This is the screen that shows the 9 circle unlock widget and instructs
-     the user how to unlock their device, or make an emergency call.  This
-     is the portrait layout.  -->
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/root"
-    android:gravity="center_horizontal">
-
-    <com.android.internal.widget.DigitalClock android:id="@+id/time"
-        android:layout_marginTop="@dimen/keyguard_lockscreen_status_line_clockfont_top_margin"
-        android:layout_marginBottom="@dimen/keyguard_lockscreen_status_line_clockfont_bottom_margin"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
-        android:layout_gravity="right">
-
-        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on
-        top of the other. Hence the redundant layout... -->
-        <TextView android:id="@+id/timeDisplayBackground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/lockscreen_clock_background"
-            />
-
-        <TextView android:id="@+id/timeDisplayForeground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/lockscreen_clock_foreground"
-            />
-
-    </com.android.internal.widget.DigitalClock>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin">
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            />
-
-        <TextView
-            android:id="@+id/alarm_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dip"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            android:drawablePadding="4dip"
-            />
-
-    </LinearLayout>
-
-
-    <TextView
-        android:id="@+id/status1"
-        android:layout_gravity="right"
-        android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-        android:drawablePadding="4dip"
-        />
-
-    <Space android:layout_gravity="fill" />
-
-    <!-- We need MATCH_PARENT here only to force the size of the parent to be passed to
-    the pattern view for it to compute its size. This is an unusual case, caused by
-    LockPatternView's requirement to maintain a square aspect ratio based on the width
-    of the screen. -->
-    <!-- width and height of pattern lock set to fit on small screen -->
-    <!-- marginBottom reduced from 4dip to 2dip -->
-    <com.android.internal.widget.LockPatternView
-        android:id="@+id/lockPattern"
-        android:layout_width="260dip"
-        android:layout_height="240dip"
-        android:layout_marginRight="8dip"
-        android:layout_marginBottom="2dip"
-        android:layout_marginLeft="8dip"
-        android:layout_gravity="center_horizontal"
-     />
-
-    <TextView
-        android:id="@+id/carrier"
-        android:layout_gravity="center_horizontal"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-    />
-
-    <!-- Footer: an emergency call button and an initially hidden "Forgot pattern" button -->
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        style="?android:attr/buttonBarStyle"
-        android:gravity="center"
-        android:weightSum="2">
-
-        <Button android:id="@+id/emergencyCallButton"
-            android:layout_gravity="center_horizontal"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="?android:attr/buttonBarButtonStyle"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            android:text="@string/lockscreen_emergency_call"
-            android:drawableLeft="@drawable/lockscreen_emergency_button"
-            android:drawablePadding="0dip"
-        />
-
-        <Button android:id="@+id/forgotPatternButton"
-            android:layout_gravity="center_horizontal"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="?android:attr/buttonBarButtonStyle"
-            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
-            android:text="@string/lockscreen_forgot_pattern_button_text"
-            android:drawableLeft="@drawable/lockscreen_forgot_password_button"
-            android:drawablePadding="0dip"
-        />
-
-    </LinearLayout>
-
-    <!-- Music transport control -->
-    <include android:id="@+id/transport"
-        layout="@layout/keyguard_transport_control"
-        android:layout_row="0"
-        android:layout_column="0"
-        android:layout_rowSpan="4"
-        android:layout_columnSpan="1"
-        android:layout_gravity="fill"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        />
-
-    <!-- Area to overlay FaceLock -->
-    <TextView android:id="@+id/faceLockAreaView"
-        android:visibility="invisible"
-        android:layout_row="4"
-        android:layout_column="0"
-        android:layout_rowSpan="1"
-        android:layout_columnSpan="1"
-        android:layout_gravity="fill"
-        android:layout_marginTop="8dip"
-        android:layout_marginBottom="8dip"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        android:background="@color/facelock_color_background"
-    />
-
-</GridLayout>