Disabling QuickContact in the two-pane layout
Change-Id: I80386eef9069da518749d56c02fbe6a9b3a5abab
diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 9cc86db..db353e8 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -359,6 +359,7 @@
mRequest.isSearchMode() && mRequest.isDirectorySearchEnabled());
fragment.setAizyEnabled(!mRequest.isSearchMode());
fragment.setSelectionVisible(mContactContentDisplayed);
+ fragment.setQuickContactEnabled(!mContactContentDisplayed);
return fragment;
}
@@ -372,6 +373,7 @@
fragment.setFrequentlyContactedContactsIncluded(false);
fragment.setStarredContactsIncluded(true);
fragment.setSelectionVisible(mContactContentDisplayed);
+ fragment.setQuickContactEnabled(!mContactContentDisplayed);
return fragment;
}
@@ -381,6 +383,7 @@
fragment.setFrequentlyContactedContactsIncluded(true);
fragment.setStarredContactsIncluded(false);
fragment.setSelectionVisible(mContactContentDisplayed);
+ fragment.setQuickContactEnabled(!mContactContentDisplayed);
return fragment;
}
@@ -390,6 +393,7 @@
fragment.setFrequentlyContactedContactsIncluded(true);
fragment.setStarredContactsIncluded(true);
fragment.setSelectionVisible(mContactContentDisplayed);
+ fragment.setQuickContactEnabled(!mContactContentDisplayed);
return fragment;
}
diff --git a/src/com/android/contacts/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
index ef0807a..2717c51 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -52,6 +52,7 @@
private boolean mNameHighlightingEnabled;
private boolean mDisplayPhotos;
+ private boolean mQuickContactEnabled;
private ContactPhotoLoader mPhotoLoader;
private String mQueryString;
@@ -205,6 +206,14 @@
this.mSelectionVisible = flag;
}
+ public boolean isQuickContactEnabled() {
+ return mQuickContactEnabled;
+ }
+
+ public void setQuickContactEnabled(boolean quickContactEnabled) {
+ mQuickContactEnabled = quickContactEnabled;
+ }
+
public void configureDirectoryLoader(DirectoryListLoader loader) {
loader.setDirectorySearchEnabled(mDirectorySearchEnabled);
}
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index 1315922..24ee508 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -85,6 +85,7 @@
private static final String KEY_LIST_STATE = "liststate";
private static final String KEY_SECTION_HEADER_DISPLAY_ENABLED = "sectionHeaderDisplayEnabled";
private static final String KEY_PHOTO_LOADER_ENABLED = "photoLoaderEnabled";
+ private static final String KEY_QUICK_CONTACT_ENABLED = "quickContactEnabled";
private static final String KEY_SEARCH_MODE = "searchMode";
private static final String KEY_AIZY_ENABLED = "aizyEnabled";
private static final String KEY_QUERY_STRING = "queryString";
@@ -102,6 +103,7 @@
private boolean mSectionHeaderDisplayEnabled;
private boolean mPhotoLoaderEnabled;
+ private boolean mQuickContactEnabled = true;
private boolean mSearchMode;
private boolean mAizyEnabled;
private String mQueryString;
@@ -216,6 +218,7 @@
super.onSaveInstanceState(outState);
outState.putBoolean(KEY_SECTION_HEADER_DISPLAY_ENABLED, mSectionHeaderDisplayEnabled);
outState.putBoolean(KEY_PHOTO_LOADER_ENABLED, mPhotoLoaderEnabled);
+ outState.putBoolean(KEY_QUICK_CONTACT_ENABLED, mQuickContactEnabled);
outState.putBoolean(KEY_SEARCH_MODE, mSearchMode);
outState.putBoolean(KEY_AIZY_ENABLED, mAizyEnabled);
outState.putBoolean(KEY_DIRECTORY_SEARCH_ENABLED, mDirectorySearchEnabled);
@@ -242,6 +245,7 @@
mSectionHeaderDisplayEnabled = savedState.getBoolean(KEY_SECTION_HEADER_DISPLAY_ENABLED);
mPhotoLoaderEnabled = savedState.getBoolean(KEY_PHOTO_LOADER_ENABLED);
+ mQuickContactEnabled = savedState.getBoolean(KEY_QUICK_CONTACT_ENABLED);
mSearchMode = savedState.getBoolean(KEY_SEARCH_MODE);
mAizyEnabled = savedState.getBoolean(KEY_AIZY_ENABLED);
mDirectorySearchEnabled = savedState.getBoolean(KEY_DIRECTORY_SEARCH_ENABLED);
@@ -507,6 +511,10 @@
this.mSelectionVisible = flag;
}
+ public void setQuickContactEnabled(boolean flag) {
+ this.mQuickContactEnabled = flag;
+ }
+
public void setSearchMode(boolean flag) {
if (mSearchMode != flag) {
mSearchMode = flag;
@@ -679,6 +687,7 @@
return;
}
+ mAdapter.setQuickContactEnabled(mQuickContactEnabled);
mAdapter.setQueryString(mQueryString);
mAdapter.setDirectorySearchEnabled(mDirectorySearchEnabled);
mAdapter.setPinnedPartitionHeadersEnabled(mSearchMode);
diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index a18e016..8cf47a6 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -77,7 +77,6 @@
protected static final int CONTACT_SNIPPET_DATA1_COLUMN_INDEX = 11;
protected static final int CONTACT_SNIPPET_DATA4_COLUMN_INDEX = 12;
- private boolean mQuickContactEnabled;
private CharSequence mUnknownNameText;
private int mDisplayNameColumnIndex;
private int mAlternativeDisplayNameColumnIndex;
@@ -130,14 +129,6 @@
return ((Cursor)getItem(position)).getString(mDisplayNameColumnIndex);
}
- public boolean isQuickContactEnabled() {
- return mQuickContactEnabled;
- }
-
- public void setQuickContactEnabled(boolean quickContactEnabled) {
- mQuickContactEnabled = quickContactEnabled;
- }
-
@Override
public void setContactNameDisplayOrder(int displayOrder) {
super.setContactNameDisplayOrder(displayOrder);
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index dd0ae3e..76ba490 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -128,7 +128,6 @@
DefaultContactListAdapter adapter = new DefaultContactListAdapter(getContext());
adapter.setSectionHeaderDisplayEnabled(isSectionHeaderDisplayEnabled());
adapter.setDisplayPhotos(true);
- adapter.setQuickContactEnabled(true);
return adapter;
}