Merge "Hide favorties in account view and stop loading ME (1/2)" (8060de83) · Commits · e / os / android_packages_apps_Contacts

res/layout/user_profile_header.xml

deleted100644 → 0

+0 −52

Original line number	Diff line number	Diff line
		<?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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/user_profile_header"
		android:orientation="horizontal"
		android:layout_width="match_parent"
		android:layout_height="?attr/list_item_header_height"
		android:paddingLeft="?attr/list_item_padding_left"
		android:paddingRight="?attr/list_item_padding_right"
		android:paddingStart="?attr/list_item_padding_left"
		android:paddingEnd="?attr/list_item_padding_right"
		android:paddingTop="4dp"
		android:paddingBottom="8dp" >

		<TextView android:id="@+id/profile_title"
		android:layout_width="@dimen/contact_list_section_header_width"
		android:layout_height="?android:attr/listPreferredItemHeight"
		android:singleLine="true"
		android:text="@string/user_profile_contacts_list_header"
		android:ellipsize="end"
		android:textAppearance="@style/SectionHeaderStyle"
		android:gravity="start\|center_vertical" />

		<Button android:id="@+id/user_profile_button"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="?android:attr/listPreferredItemHeight"
		android:paddingStart="?attr/list_item_padding_left"
		android:paddingEnd="?attr/list_item_padding_right"
		android:background="?android:attr/selectableItemBackground"
		android:singleLine="true"
		android:text="@string/profile_display_name"
		android:ellipsize="end"
		android:gravity="start\|center_vertical"
		android:textAppearance="?android:attr/textAppearanceMedium" />

		</LinearLayout>

res/values/strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -624,10 +624,6 @@
		<xliff:g id="call_type" example="Friends">%1$s</xliff:g> <xliff:g id="call_short_date" example="Friends">%2$s</xliff:g>
		</string>

		<!-- Text displayed in place of the display name for the contact that represents the user's
		personal profile entry [CHAR LIMIT=64] -->
		<string name="profile_display_name">Set up my profile</string>

		<!-- Label to instruct the user to type in a contact's name to add the contact as a member of the current group. [CHAR LIMIT=64] -->
		<string name="enter_contact_name">Type person\'s name</string>

src/com/android/contacts/activities/ContactSelectionActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -290,7 +290,6 @@ public class ContactSelectionActivity extends ContactsActivity
		case ContactsRequest.ACTION_DEFAULT:
		case ContactsRequest.ACTION_PICK_CONTACT: {
		ContactPickerFragment fragment = new ContactPickerFragment();
		fragment.setIncludeProfile(mRequest.shouldIncludeProfile());
		fragment.setIncludeFavorites(mRequest.shouldIncludeFavorites());
		mListFragment = fragment;
		break;

src/com/android/contacts/list/ContactBrowseListFragment.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -401,11 +401,8 @@ public abstract class ContactBrowseListFragment extends
		}
		}

		// Display the user's profile if not in search mode
		adapter.setIncludeProfile(!searchMode);

		// Display favorites if not in search mode
		adapter.setIncludeFavorites(!searchMode);
		adapter.setIncludeFavorites(!searchMode
		&& mFilter.filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS);
		}

		@Override

src/com/android/contacts/list/ContactsRequest.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ public class ContactsRequest {
		private CharSequence mTitle;
		private boolean mSearchMode;
		private String mQueryString;
		private boolean mIncludeProfile;
		private boolean mIncludeFavorites;
		private boolean mLegacyCompatibilityMode;
		private boolean mDirectorySearchEnabled = true;
		@@ -98,7 +97,6 @@ public class ContactsRequest {
		+ " mTitle=" + mTitle
		+ " mSearchMode=" + mSearchMode
		+ " mQueryString=" + mQueryString
		+ " mIncludeProfile=" + mIncludeProfile
		+ " mIncludeFavorites=" + mIncludeFavorites
		+ " mLegacyCompatibilityMode=" + mLegacyCompatibilityMode
		+ " mDirectorySearchEnabled=" + mDirectorySearchEnabled
		@@ -146,14 +144,6 @@ public class ContactsRequest {
		mQueryString = string;
		}

		public boolean shouldIncludeProfile() {
		return mIncludeProfile;
		}

		public void setIncludeProfile(boolean includeProfile) {
		mIncludeProfile = includeProfile;
		}

		public boolean shouldIncludeFavorites() {
		return mIncludeFavorites;
		}