diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-08-10 02:16:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-10 02:16:19 +0000 |
| commit | 92ecd0f1d9a296f4654b5863ff1d991f435166f2 (patch) | |
| tree | 55c14223d0075858384b4cf044d0a9899dc6cf59 | |
| parent | c87896cd74290eba75d3ba3ee8a3f5bfe36b63fb (diff) | |
| parent | 4e4d12f1d2a82694ee376d58bb0fe450dd325802 (diff) | |
Merge "Hide dial button in-call so that in-call chooser dialog shows up" into klp-dev
| -rw-r--r-- | res/layout/dialpad_chooser_list_item.xml | 5 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/res/layout/dialpad_chooser_list_item.xml b/res/layout/dialpad_chooser_list_item.xml index 853ca4734..5ba88ca54 100644 --- a/res/layout/dialpad_chooser_list_item.xml +++ b/res/layout/dialpad_chooser_list_item.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,6 +27,7 @@ <TextView android:id="@+id/text" android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/dialpad_text_color" android:layout_gravity="center_vertical" android:layout_width="0dip" android:layout_weight="1" diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index f3a1e99f5..fefbcc43c 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -377,6 +377,7 @@ public class DialpadFragment extends Fragment // Load up the resources for the text field. Resources r = getResources(); + mDialButtonContainer = fragmentView.findViewById(R.id.dialButtonContainer); mDigitsContainer = fragmentView.findViewById(R.id.digits_container); mDigits = (EditText) fragmentView.findViewById(R.id.digits); mDigits.setKeyListener(UnicodeDialerKeyListener.INSTANCE); |