Merge "Import revised translations."
diff --git a/res/layout/contacts_list_content.xml b/res/layout/contacts_list_content.xml
index 66c3936..cc0ebf4 100644
--- a/res/layout/contacts_list_content.xml
+++ b/res/layout/contacts_list_content.xml
@@ -24,7 +24,8 @@
android:id="@+id/pinned_header_list_layout"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:background="?attr/contact_browser_background" >
<!-- Shown only when an Account filter is set.
- paddingTop should be here to show "shade" effect correctly. -->
diff --git a/res/menu/call_log_options.xml b/res/menu/call_log_options.xml
index c62be77..c75c856 100644
--- a/res/menu/call_log_options.xml
+++ b/res/menu/call_log_options.xml
@@ -29,10 +29,4 @@
android:id="@+id/show_all_calls"
android:title="@string/menu_show_all_calls"
android:showAsAction="withText" />
-
- <item
- android:id="@+id/menu_call_settings_call_log"
- android:title="@string/call_settings"
- android:icon="@drawable/ic_menu_settings_holo_light"
- android:showAsAction="withText" />
</menu>
diff --git a/res/menu/dialpad_options.xml b/res/menu/dialpad_options.xml
index 4dc62a8..77da9cb 100644
--- a/res/menu/dialpad_options.xml
+++ b/res/menu/dialpad_options.xml
@@ -30,10 +30,4 @@
android:icon="@drawable/ic_menu_wait"
android:title="@string/add_wait"
android:showAsAction="withText" />
-
- <item
- android:id="@+id/menu_call_settings_dialpad"
- android:title="@string/call_settings"
- android:icon="@drawable/ic_menu_settings_holo_light"
- android:showAsAction="withText" />
</menu>
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
index 99f87ff..cc9543a 100644
--- a/res/menu/dialtacts_options.xml
+++ b/res/menu/dialtacts_options.xml
@@ -20,6 +20,12 @@
android:showAsAction="always" />
<item
+ android:id="@+id/menu_call_settings"
+ android:title="@string/call_settings"
+ android:icon="@drawable/ic_menu_settings_holo_light"
+ android:showAsAction="withText" />
+
+ <item
android:id="@+id/filter_option"
android:title="@string/menu_contacts_filter"
android:showAsAction="withText" />
diff --git a/res/values-sw580dp-w720dp/styles.xml b/res/values-sw580dp-w720dp/styles.xml
index 4314c80..e386bda 100644
--- a/res/values-sw580dp-w720dp/styles.xml
+++ b/res/values-sw580dp-w720dp/styles.xml
@@ -46,6 +46,7 @@
<item name="contact_filter_popup_width">320dip</item>
<item name="contact_browser_list_padding_left">0dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/transparent</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<!-- Favorites -->
<item name="favorites_padding_bottom">0dip</item>
diff --git a/res/values-sw580dp/styles.xml b/res/values-sw580dp/styles.xml
index efbbde2..9244faa 100644
--- a/res/values-sw580dp/styles.xml
+++ b/res/values-sw580dp/styles.xml
@@ -46,6 +46,7 @@
<item name="contact_filter_popup_width">320dip</item>
<item name="contact_browser_list_padding_left">0dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/transparent</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<!-- Favorites -->
<item name="favorites_padding_bottom">0dip</item>
@@ -77,6 +78,7 @@
<item name="contact_filter_popup_width">320dip</item>
<item name="contact_browser_list_padding_left">16dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/transparent</item>
</style>
<style name="ContactPickerLayout" parent="ContactPickerTheme">
<item name="android:layout_width">match_parent</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7bec43a..cd5d137 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -70,6 +70,7 @@
<attr name="contact_filter_popup_width" format="dimension"/>
<attr name="contact_browser_list_padding_left" format="dimension"/>
<attr name="contact_browser_list_padding_right" format="dimension"/>
+ <attr name="contact_browser_background" format="reference"/>
</declare-styleable>
<declare-styleable name="ContactListItemView">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 677ac10..ae74a56 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -47,6 +47,7 @@
<item name="contact_filter_popup_width">320dip</item>
<item name="contact_browser_list_padding_left">16dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/black</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<!-- CallLog -->
<item name="call_log_primary_text_color">#FFFFFF</item>
@@ -156,6 +157,7 @@
<item name="contact_filter_popup_width">320dip</item>
<item name="contact_browser_list_padding_left">16dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/transparent</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<item name="list_item_contacts_count_text_size">12sp</item>
<!-- Favorites -->
@@ -199,6 +201,7 @@
<item name="contact_filter_popup_width">320dip</item>
<item name="contact_browser_list_padding_left">16dip</item>
<item name="contact_browser_list_padding_right">0dip</item>
+ <item name="contact_browser_background">@android:color/transparent</item>
</style>
<style name="ContactPickerTheme" parent="@style/PeopleTheme">
diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index 76cbc7d..45ce4fe 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -16,10 +16,10 @@
package com.android.contacts;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.NumberParseException;
+import com.android.i18n.phonenumbers.PhoneNumberUtil;
+import com.android.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index cfca831..d0acc6b 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -644,19 +644,24 @@
public boolean onPrepareOptionsMenu(Menu menu) {
final MenuItem searchMenuItem = menu.findItem(R.id.search_on_action_bar);
final MenuItem filterOptionMenuItem = menu.findItem(R.id.filter_option);
+ final MenuItem callSettingsMenuItem = menu.findItem(R.id.menu_call_settings);
Tab tab = getActionBar().getSelectedTab();
if (mInSearchUi) {
searchMenuItem.setVisible(false);
filterOptionMenuItem.setVisible(true);
filterOptionMenuItem.setOnMenuItemClickListener(
mFilterOptionsMenuItemClickListener);
- } else if (tab == null || tab.getPosition() == TAB_INDEX_DIALER) {
- searchMenuItem.setVisible(false);
- filterOptionMenuItem.setVisible(false);
+ callSettingsMenuItem.setVisible(false);
} else {
+ if (tab != null && tab.getPosition() == TAB_INDEX_DIALER) {
+ searchMenuItem.setVisible(false);
+ } else {
+ searchMenuItem.setVisible(true);
+ searchMenuItem.setOnMenuItemClickListener(mSearchMenuItemClickListener);
+ }
filterOptionMenuItem.setVisible(false);
- searchMenuItem.setVisible(true);
- searchMenuItem.setOnMenuItemClickListener(mSearchMenuItemClickListener);
+ callSettingsMenuItem.setVisible(true);
+ callSettingsMenuItem.setIntent(DialtactsActivity.getCallSettingsIntent());
}
return true;
diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index a40379d..215fd7b 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -220,8 +220,6 @@
@Override
public void onPrepareOptionsMenu(Menu menu) {
if (mShowOptionsMenu) {
- menu.findItem(R.id.menu_call_settings_call_log)
- .setIntent(DialtactsActivity.getCallSettingsIntent());
menu.findItem(R.id.show_voicemails_only).setVisible(!mShowingVoicemailOnly);
menu.findItem(R.id.show_all_calls).setVisible(mShowingVoicemailOnly);
}
diff --git a/src/com/android/contacts/dialpad/DialpadFragment.java b/src/com/android/contacts/dialpad/DialpadFragment.java
index a5db5ce..62ba95e 100644
--- a/src/com/android/contacts/dialpad/DialpadFragment.java
+++ b/src/com/android/contacts/dialpad/DialpadFragment.java
@@ -571,14 +571,10 @@
}
private void setupMenuItems(Menu menu) {
- final MenuItem callSettingsMenuItem = menu.findItem(R.id.menu_call_settings_dialpad);
final MenuItem addToContactMenuItem = menu.findItem(R.id.menu_add_contacts);
final MenuItem twoSecPauseMenuItem = menu.findItem(R.id.menu_2s_pause);
final MenuItem waitMenuItem = menu.findItem(R.id.menu_add_wait);
- callSettingsMenuItem.setVisible(true);
- callSettingsMenuItem.setIntent(DialtactsActivity.getCallSettingsIntent());
-
// We show "add to contacts", "2sec pause", and "add wait" menus only when the user is
// seeing usual dialpads and has typed at least one digit.
// We never show a menu if the "choose dialpad" UI is up.
@@ -910,6 +906,11 @@
* of the regular Dialer UI
*/
private void showDialpadChooser(boolean enabled) {
+ // Check if onCreateView() is already called by checking one of View objects.
+ if (mDigits == null) {
+ return;
+ }
+
if (enabled) {
// Log.i(TAG, "Showing dialpad chooser!");
mDigits.setVisibility(View.GONE);
diff --git a/src/com/android/contacts/interactions/PhoneNumberInteraction.java b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
index 0448bd5..918dac0 100644
--- a/src/com/android/contacts/interactions/PhoneNumberInteraction.java
+++ b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
@@ -24,11 +24,11 @@
import com.android.contacts.model.AccountType.StringInflater;
import com.android.contacts.model.AccountTypeManager;
import com.android.contacts.model.DataKind;
+import com.android.i18n.phonenumbers.NumberParseException;
+import com.android.i18n.phonenumbers.PhoneNumberUtil;
+import com.android.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import com.google.common.annotations.VisibleForTesting;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index b517c2c..04b3fa8 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -16,12 +16,12 @@
package com.android.contacts.model;
+import com.android.i18n.phonenumbers.PhoneNumberUtil;
import com.android.internal.util.Objects;
import com.google.android.collect.Lists;
import com.google.android.collect.Maps;
import com.google.android.collect.Sets;
import com.google.common.annotations.VisibleForTesting;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
import android.accounts.Account;
import android.accounts.AccountManager;