Merge "lockscreen: new Ring style - overlay (4/3)" into gingerbread
diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
index 2c49fc4..ce8bc99 100644
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -199,6 +199,14 @@
android:layout_alignParentBottom="true"
/>
+ <com.android.internal.widget.RingSelector
+ android:id="@+id/ring_selector"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentBottom="true"
+ />
+
<!-- emergency call button shown when sim is PUKd and tab_selector is
hidden -->
<Button
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
index 0855a96..fc8bcb4 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout-mdpi/incall_touch_ui.xml
@@ -48,6 +48,15 @@
android:layout_alignParentBottom="true"
/>
+ <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
+ <com.android.internal.widget.RingSelector
+ android:id="@+id/incomingRingSelectorCallWidget"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ android:layout_alignParentBottom="true"
+ />
+
<!--
(2) inCallControls: the widgets visible while a regular call
(or calls) is in progress
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
index a7981a8..be15c52 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui.xml
@@ -48,6 +48,15 @@
android:layout_alignParentBottom="true"
/>
+ <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
+ <com.android.internal.widget.RingSelector
+ android:id="@+id/incomingRingSelectorCallWidget"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ android:layout_alignParentBottom="true"
+ />
+
<!--
(2) inCallControls: the widgets visible while a regular call
(or calls) is in progress
diff --git a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
index d6ac08e..2a79902 100644
--- a/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
+++ b/overlay/ldpi/packages/apps/Phone/res/layout/incall_touch_ui_left.xml
@@ -48,6 +48,15 @@
android:layout_alignParentBottom="true"
/>
+ <!-- (1) incomingCallWidget: the UI displayed while an incoming call is ringing. -->
+ <com.android.internal.widget.RingSelector
+ android:id="@+id/incomingRingSelectorCallWidget"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ android:layout_alignParentBottom="true"
+ />
+
<!--
(2) inCallControls: the widgets visible while a regular call
(or calls) is in progress