Stop using private resources
- call_background.xml points to one of private resource, but the method
relying on the xml isn't used any more. Let's remove the entire
method.
- use local version of action_menu_overflow_description
Bug: 6063210
Change-Id: I9ea6788ca4232492a8c62a8aa8460159314abee4
diff --git a/res/drawable/call_background.xml b/res/drawable/call_background.xml
deleted file mode 100644
index fbc9b3c..0000000
--- a/res/drawable/call_background.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- 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.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_window_focused="false"
- android:drawable="@android:color/transparent" />
- <item android:state_focused="false" android:state_pressed="true"
- android:drawable="@*android:drawable/list_selector_background_transition" />
- <item android:state_focused="false" android:state_pressed="false"
- android:drawable="@android:drawable/screen_background_dark"/>
-
-</selector>
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index df13372..a95e4cb 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -98,7 +98,7 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_gravity="bottom|center_horizontal"
android:src="@drawable/ic_menu_overflow"
- android:contentDescription="@*android:string/action_menu_overflow_description"
+ android:contentDescription="@string/action_menu_overflow_description"
android:nextFocusLeft="@id/digits"
android:background="?android:attr/selectableItemBackground"/>
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 936f844..6fc84a9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1791,4 +1791,10 @@
voicemail service in Airplane mode. [CHAR LIMI=NONE] -->
<string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string>
+ <!-- Content description for the fake action menu overflow button.
+ This should be same as the description for the real action menu
+ overflow button available in ActionBar.
+ [CHAR LIMIT=NONE] -->
+ <string name="action_menu_overflow_description" msgid="2295659037509008453">More options</string>
+
</resources>
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 4390d78..f3de16c 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -904,31 +904,6 @@
}
/**
- * Adds a call button using the supplied arguments as an id and tag.
- */
- public void showCallButton(int id, int tag) {
- if (mCallButton == null) {
- mCallButton = new DontPressWithParentImageView(mContext, null);
- mCallButton.setId(id);
- mCallButton.setOnClickListener(mCallButtonClickListener);
- mCallButton.setBackgroundResource(R.drawable.call_background);
- mCallButton.setImageResource(android.R.drawable.sym_action_call);
- mCallButton.setPadding(mCallButtonPadding, 0, mCallButtonPadding, 0);
- mCallButton.setScaleType(ScaleType.CENTER);
- addView(mCallButton);
- }
-
- mCallButton.setTag(tag);
- mCallButton.setVisibility(View.VISIBLE);
- }
-
- public void hideCallButton() {
- if (mCallButton != null) {
- mCallButton.setVisibility(View.GONE);
- }
- }
-
- /**
* Adds or updates a text view for the phonetic name.
*/
public void setPhoneticName(char[] text, int size) {