diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-23 11:08:06 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-23 11:15:44 -0700 |
| commit | 53abf18bc4de9e0c414d0ef413ec3717b6eee906 (patch) | |
| tree | b83f4ffc76a7b82c3aaf72d4e35515c4e94df8c4 | |
| parent | 6af73542e5a50b30cd62214d27d2d4ad88fa4982 (diff) | |
Fix indicator visibility
Show the indicator if it's a WiFi call, or Handoff-capable. This
will prevent the indicator from showing up on normal PSTN calls.
Change-Id: I1b893f6b6bb2276783d40a59f3521349a38070d8
| -rw-r--r-- | InCallUI/res/layout/call_card.xml | 4 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml index 2178ab7a5..e6f06f38c 100644 --- a/InCallUI/res/layout/call_card.xml +++ b/InCallUI/res/layout/call_card.xml @@ -119,8 +119,8 @@ <ImageButton android:id="@+id/handoffButton" android:enabled="false" - android:layout_width="@dimen/floating_action_button_width" - android:layout_height="@dimen/floating_action_button_height" + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" android:layout_marginBottom="@dimen/end_call_button_margin_bottom" android:background="@drawable/floating_handoff_button_compound_background" android:src="@drawable/ic_in_call_pstn" /> diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index ad549bc52..317947440 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -305,7 +305,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } mHandoffButton.setEnabled(isHandoffCapable && !isHandoffPending); - mHandoffButton.setVisibility(mHandoffButton.isEnabled() ? View.VISIBLE : View.GONE); + mHandoffButton.setVisibility(isWiFi || mHandoffButton.isEnabled() ? + View.VISIBLE : View.GONE); mHandoffButton.setImageResource(isWiFi ? R.drawable.ic_in_call_wifi : R.drawable.ic_in_call_pstn); } |