diff options
| -rw-r--r-- | InCallUI/res/layout/answer_fragment.xml | 2 | ||||
| -rw-r--r-- | InCallUI/res/layout/call_card.xml | 11 | ||||
| -rw-r--r-- | InCallUI/res/layout/incall_screen.xml | 12 | ||||
| -rw-r--r-- | InCallUI/res/values/colors.xml | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 2 |
5 files changed, 15 insertions, 14 deletions
diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml index 15c2093eb..92630b89b 100644 --- a/InCallUI/res/layout/answer_fragment.xml +++ b/InCallUI/res/layout/answer_fragment.xml @@ -25,7 +25,7 @@ android:focusable="true" android:layout_centerHorizontal="true" android:gravity="center" - android:background="@android:color/black" + android:background="@color/glowpad_background_color" android:visibility="gone" dc:targetDrawables="@array/incoming_call_widget_3way_targets" diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml index 07ecef074..6a06cabd0 100644 --- a/InCallUI/res/layout/call_card.xml +++ b/InCallUI/res/layout/call_card.xml @@ -75,6 +75,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + <fragment android:name="com.android.incallui.AnswerFragment" + android:id="@+id/answerFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:gravity="top" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="@dimen/glowpadview_margin_bottom" + android:visibility="gone" /> + </FrameLayout> </LinearLayout> diff --git a/InCallUI/res/layout/incall_screen.xml b/InCallUI/res/layout/incall_screen.xml index 45bf37a11..9f7569574 100644 --- a/InCallUI/res/layout/incall_screen.xml +++ b/InCallUI/res/layout/incall_screen.xml @@ -27,18 +27,6 @@ android:layout_alignParentTop="true" android:layout_alignParentStart="true" /> - - <fragment android:name="com.android.incallui.AnswerFragment" - android:id="@+id/answerFragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:gravity="top" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="@dimen/glowpadview_margin_bottom" - android:visibility="gone" /> - <fragment android:name="com.android.incallui.ConferenceManagerFragment" android:id="@+id/conferenceManagerFragment" android:layout_width="match_parent" diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index 0cdf93a01..7b23b60a5 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -19,6 +19,8 @@ <!-- In-call UI background color. --> <color name="incall_background_color">#0fc6dc</color> + <!-- 80% opacity, black. --> + <color name="glowpad_background_color">#cc000000</color> <!-- green --> <color name="incall_callTypeSip">#99CE3F</color> diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index b491dfa9c..f466ac54e 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -490,7 +490,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } public void setEndCallButtonEnabled(boolean enabled) { - mEndCallButton.setEnabled(enabled); + mEndCallButton.setVisibility(enabled ? View.VISIBLE : View.GONE); } private void dispatchPopulateAccessibilityEvent(AccessibilityEvent event, View view) { |