Merge "Bump modversion for RC2" into gingerbread
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
new file mode 100644
index 0000000..074b11f
--- /dev/null
+++ b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_unlock_portrait.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+
+<!-- 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. -->
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:background="#70000000"
+ >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <TextView
+ android:id="@+id/carrier"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="2dip"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="8dip"
+ android:layout_toRightOf="@+id/time"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:gravity="right|bottom"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ />
+
+ <com.android.internal.widget.DigitalClock android:id="@+id/time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="8dip"
+ android:layout_marginLeft="8dip"
+ >
+
+ <TextView android:id="@+id/timeDisplay"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="bottom"
+ android:singleLine="true"
+ android:ellipsize="none"
+ android:textSize="56sp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:shadowColor="#C0000000"
+ android:shadowDx="0"
+ android:shadowDy="0"
+ android:shadowRadius="3.0"
+ android:layout_marginBottom="0dip"
+ />
+
+ <TextView android:id="@+id/am_pm"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="bottom"
+ android:singleLine="true"
+ android:ellipsize="none"
+ android:textSize="18sp"
+ android:layout_marginLeft="4dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:shadowColor="#C0000000"
+ android:shadowDx="0"
+ android:shadowDy="0"
+ android:shadowRadius="3.0"
+ />
+
+ </com.android.internal.widget.DigitalClock>
+
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/time"
+ android:layout_marginLeft="12dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ />
+
+ </RelativeLayout>
+
+ <View
+ android:id="@+id/divider"
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="4dip"
+ android:background="@android:drawable/divider_horizontal_dark"
+ />
+
+ <!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging
+ status. -->
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="0dip"
+ android:layout_marginLeft="12dip"
+ android:gravity="left"
+ >
+ <TextView
+ android:id="@+id/status1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="16sp"
+ android:drawablePadding="4dip"
+ />
+ <TextView
+ android:id="@+id/statusSep"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="5dip"
+ android:layout_marginRight="5dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="16sp"
+ />
+ <TextView
+ android:id="@+id/status2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="16sp"
+ android:drawablePadding="4dip"
+ />
+ </LinearLayout>
+
+ <com.android.internal.widget.LockPatternView
+ android:id="@+id/lockPattern"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:layout_marginTop="2dip"
+ android:aspect="@string/lock_pattern_view_aspect"
+ />
+
+ <!-- footer -->
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+
+ <!-- option 1: a single emergency call button -->
+ <RelativeLayout android:id="@+id/footerNormal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ >
+ <Button android:id="@+id/emergencyCallAlone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="@string/lockscreen_emergency_call"
+ style="@style/Widget.Button.Transparent"
+ android:drawableLeft="@drawable/ic_emergency"
+ android:drawablePadding="8dip"
+ />
+
+ </RelativeLayout>
+
+ <!-- option 2: an emergency call button, and a 'forgot pattern?' button -->
+ <LinearLayout android:id="@+id/footerForgotPattern"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ >
+ <Button android:id="@+id/emergencyCallTogether"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:layout_marginTop="4dip"
+ android:layout_marginBottom="4dip"
+ android:layout_marginLeft="4dip"
+ android:layout_marginRight="2dip"
+ android:text="@string/lockscreen_emergency_call"
+ style="@style/Widget.Button.Transparent"
+ android:drawableLeft="@drawable/ic_emergency"
+ android:drawablePadding="8dip"
+ />
+ <Button android:id="@+id/forgotPattern"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:layout_marginTop="4dip"
+ android:layout_marginBottom="4dip"
+ android:layout_marginLeft="2dip"
+ android:layout_marginRight="4dip"
+ style="@style/Widget.Button.Transparent"
+ android:visibility="invisible"
+ />
+ </LinearLayout>
+
+ </FrameLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
\ No newline at end of file
diff --git a/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg b/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg
new file mode 100644
index 0000000..5bf2372
--- /dev/null
+++ b/overlay/ldpi/packages/apps/FM/res/drawable-mdpi/fmradio_background.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
index 451a620..646fa79 100644
--- a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
+++ b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
@@ -12,9 +12,9 @@
<LinearLayout android:id="@+id/presets_layout"
android:background="@drawable/favorite_bg"
android:layout_width="match_parent"
- android:layout_height="48dip"
+ android:layout_height="38dip"
android:orientation="horizontal"
- android:layout_marginTop="170dip"
+ android:layout_marginTop="212dip"
android:layout_marginLeft="14px"
android:layout_marginRight="13px"
>
@@ -62,9 +62,9 @@
android:layout_width="match_parent"
android:layout_height="48dip"
android:orientation="horizontal"
- android:layout_marginTop="5dip"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
+ android:layout_marginTop="4dip"
+ android:paddingLeft="14dip"
+ android:paddingRight="13dip"
>
<ImageButton android:id="@+id/btn_speaker"
android:src="@drawable/button_loudspeaker_off"
@@ -78,7 +78,7 @@
android:background="@drawable/station_freq_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="40dip"
+ android:layout_marginLeft="28dip"
>
<TextView android:id="@+id/prog_frequency_tv"
android:layout_width="match_parent"
@@ -94,7 +94,7 @@
<ImageButton android:id="@+id/btn_onoff"
android:src="@drawable/button_power_off"
android:background="@null"
- android:layout_marginLeft="45dip"
+ android:layout_marginLeft="28dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
@@ -108,23 +108,23 @@
android:thumb="@drawable/freq_indicator"
android:thumbOffset="0dip"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="54dip"
android:layout_marginLeft="11dip"
android:layout_marginRight="6dip"
- android:layout_marginTop="5dip"
+ android:layout_marginTop="4dip"
/>
<!-- This is horizontal FM tuner -->
<com.android.fm.radio.TunerView
android:id="@+id/fm_tuner_view"
android:src="@drawable/tuner_view_0"
- android:layout_width="240px"
- android:layout_height="40px"
- android:paddingTop="0px"
- android:paddingBottom="23px"
- android:paddingLeft="20px"
- android:paddingRight="20px"
- android:layout_marginTop="0dip"
+ android:layout_width="match_parent"
+ android:layout_height="30px"
+ android:paddingTop="4px"
+ android:paddingBottom="10px"
+ android:paddingLeft="10px"
+ android:paddingRight="10px"
+ android:layout_marginTop="4dip"
android:layout_gravity="center_horizontal"
/>
diff --git a/overlay/ldpi/packages/apps/FM/res/values/styles.xml b/overlay/ldpi/packages/apps/FM/res/values/styles.xml
new file mode 100644
index 0000000..d722efc
--- /dev/null
+++ b/overlay/ldpi/packages/apps/FM/res/values/styles.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+ <style name="FMStationSeekBar">
+ <item name="android:indeterminateOnly">false</item>
+ <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
+ <item name="android:indeterminateDrawable">@android:drawable/progress_horizontal</item>
+ <item name="android:minHeight">20dip</item>
+ <item name="android:maxHeight">20dip</item>
+ <item name="android:thumbOffset">8px</item>
+ <item name="android:focusable">true</item>
+ </style>
+ <style name="favoriteButtonStyle">
+ <item name="android:background">@drawable/favorite_button_bg</item>
+ <item name="android:layout_width">0dip</item>
+ <item name="android:layout_weight">1</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:textSize">18sp</item>
+ <item name="android:shadowColor">#FFE8E8E8</item>
+ <item name="android:shadowDx">0.0</item>
+ <item name="android:shadowDy">1.0</item>
+ <item name="android:shadowRadius">1.0</item>
+ </style>
+
+</resources>
