Merge "lockscreen: new Ring style - overlay (4/3)" into gingerbread
This commit is contained in:
commit
8e97fe26db
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue