diff options
| author | twyen <twyen@google.com> | 2018-04-24 14:34:33 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-04-25 11:45:21 -0700 |
| commit | 0a5c34d103dc8701e55035e98e6d9fd6c2caf33e (patch) | |
| tree | 5a2abde1030ae51aea7df5a8830cd3f782fcfddb /java/com/android/incallui | |
| parent | 66adad0ab9921afcf3aefab270c030ceee9888df (diff) | |
Disable entries in CallingAccountSelector that are not selectable
This CL also unifies the disabled color for primary and secondary text.
The in call UI dialog will be implemented in a followup CL.
TEST=TAP
DEFAULT_VALUE_OK=no server.
Bug: 69675796,72618783
Test: TAP
PiperOrigin-RevId: 194147061
Change-Id: I5be5a45a7df09061a3bf391f6ae2a32d9c73b6e3
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/ConferenceParticipantListAdapter.java | 2 | ||||
| -rw-r--r-- | java/com/android/incallui/res/layout/caller_in_conference.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/incallui/ConferenceParticipantListAdapter.java b/java/com/android/incallui/ConferenceParticipantListAdapter.java index 4780974ef..dc793f7f8 100644 --- a/java/com/android/incallui/ConferenceParticipantListAdapter.java +++ b/java/com/android/incallui/ConferenceParticipantListAdapter.java @@ -356,7 +356,7 @@ public class ConferenceParticipantListAdapter extends BaseAdapter { statusTextView.setText(onHoldText); statusTextView.setVisibility(View.VISIBLE); - int onHoldColor = getContext().getColor(R.color.dialer_secondary_text_color_hiden); + int onHoldColor = getContext().getColor(R.color.dialer_disabled_text_color); nameTextView.setTextColor(onHoldColor); numberTextView.setTextColor(onHoldColor); diff --git a/java/com/android/incallui/res/layout/caller_in_conference.xml b/java/com/android/incallui/res/layout/caller_in_conference.xml index be4eca5f6..23bb28512 100644 --- a/java/com/android/incallui/res/layout/caller_in_conference.xml +++ b/java/com/android/incallui/res/layout/caller_in_conference.xml @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/SecondaryText" - android:textColor="@color/dialer_secondary_text_color_hiden" + android:textColor="@color/dialer_disabled_text_color" android:visibility="gone"/> <!-- Number --> |