| commit | 7a6eb7f1e62546a5b785ba6492498bebb3adf1dd | [log] [tgz] |
|---|---|---|
| author | Chiao Cheng <chiaocheng@google.com> | Thu Nov 29 10:16:35 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 29 10:16:36 2012 -0800 |
| tree | 4dc23b36676b395cd7f26277c86d459265340a83 | |
| parent | 0fdbff20fd398e58127b30b634ca959787815d8f [diff] | |
| parent | 3af2d48a0c8467629be4ed255338064cc450237d [diff] |
Merge "Prevent going into single contact mode un-necessarily." into jb-mr1.1-dev
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index c60a228..a874f45 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -250,7 +250,7 @@ } private void configureActivityTitle() { - if (mRequest.getActivityTitle() != null) { + if (!TextUtils.isEmpty(mRequest.getActivityTitle())) { setTitle(mRequest.getActivityTitle()); return; }
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index b811dd9..12819dc 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -324,7 +324,6 @@ startActivity(redirect); return false; } - setTitle(mRequest.getActivityTitle()); return true; }
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java index 3dfaf8d..3773bda 100644 --- a/src/com/android/contacts/detail/ContactDetailFragment.java +++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -1862,6 +1862,11 @@ menu.add(ContextMenu.NONE, ContextMenuIds.COPY_TEXT, ContextMenu.NONE, getString(R.string.copy_text)); + // Don't allow setting or clearing of defaults for directory contacts + if (mContactData.isDirectoryEntry()) { + return; + } + String selectedMimeType = selectedEntry.mimetype; // Defaults to true will only enable the detail to be copied to the clipboard.