am 1fd53d00: am 2a66648a: Merge "Add All contacts option to overflow menu" into klp-dev
* commit '1fd53d00bf597c15a62c76811df66eb9068ebfb3':
Add All contacts option to overflow menu
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
index b306979..7e84818 100644
--- a/res/menu/dialtacts_options.xml
+++ b/res/menu/dialtacts_options.xml
@@ -21,9 +21,12 @@
android:id="@+id/menu_clear_frequents"
android:title="@string/menu_clear_frequents" />
<item
- android:id="@+id/add_contact"
+ android:id="@+id/menu_add_contact"
android:title="@string/menu_newContact"/>
<item
+ android:id="@+id/menu_all_contacts"
+ android:title="@string/menu_allContacts"/>
+ <item
android:id="@+id/menu_call_settings"
android:title="@string/call_settings"
android:orderInCategory="2" />
diff --git a/res/menu/phone_favorite_options.xml b/res/menu/phone_favorite_options.xml
deleted file mode 100644
index e37759c..0000000
--- a/res/menu/phone_favorite_options.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/menu_import_export"
- android:title="@string/menu_import_export" />
-
- <item
- android:id="@+id/menu_clear_frequents"
- android:title="@string/menu_clear_frequents" />
-
- <item
- android:id="@+id/menu_accounts"
- android:title="@string/menu_accounts" />
-</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3235d77..65746bb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -338,6 +338,9 @@
<!-- Menu item to create a new contact -->
<string name="menu_newContact">New contact</string>
+ <!-- Menu item to display all contacts -->
+ <string name="menu_allContacts">All contacts</string>
+
<!-- Title bar for call detail screen -->
<string name="callDetailTitle">Call details</string>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 4e5592a..99855f4 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -347,7 +347,7 @@
case R.id.menu_clear_frequents:
ClearFrequentsDialog.show(getFragmentManager());
return true;
- case R.id.add_contact:
+ case R.id.menu_add_contact:
try {
startActivity(new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI));
} catch (ActivityNotFoundException e) {
@@ -360,6 +360,10 @@
case R.id.menu_call_settings:
final Intent settingsIntent = DialtactsActivity.getCallSettingsIntent();
startActivity(settingsIntent);
+ return true;
+ case R.id.menu_all_contacts:
+ onShowAllContacts();
+ return true;
}
return false;
}