Update phenotype usage for GMS V4 (1/2) (df86ede2) · Commits · e / os / android_packages_apps_Contacts

src-bind/com/android/contactsbind/experiments/Flags.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		*/
		package com.android.contactsbind.experiments;

		import android.content.Context;

		import java.util.HashMap;
		import java.util.Map;

		@@ -30,7 +28,7 @@ public final class Flags {

		private Map<String, Object> mMap;

		public static Flags getInstance(Context context) {
		public static Flags getInstance() {
		if (sInstance == null) {
		sInstance = new Flags();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i
		menu.removeItem(R.id.nav_find_duplicates);
		} else {
		int id;
		if (Flags.getInstance(this).getBoolean(Experiments.ASSISTANT)) {
		if (Flags.getInstance().getBoolean(Experiments.ASSISTANT)) {
		id = R.id.nav_assistant;
		menu.removeItem(R.id.nav_find_duplicates);
		} else {

+4 −4

Original line number	Diff line number	Diff line
		@@ -119,9 +119,9 @@ public class DynamicShortcuts {
		mContentResolver = contentResolver;
		mShortcutManager = shortcutManager;
		mJobScheduler = jobScheduler;
		mContentChangeMinUpdateDelay = Flags.getInstance(mContext)
		mContentChangeMinUpdateDelay = Flags.getInstance()
		.getInteger(Experiments.DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS);
		mContentChangeMaxUpdateDelay = Flags.getInstance(mContext)
		mContentChangeMaxUpdateDelay = Flags.getInstance()
		.getInteger(Experiments.DYNAMIC_MAX_CONTENT_CHANGE_UPDATE_DELAY_MILLIS);
		}

		@@ -404,7 +404,7 @@ public class DynamicShortcuts {

		public synchronized static void initialize(Context context) {
		if (Log.isLoggable(TAG, Log.DEBUG)) {
		final Flags flags = Flags.getInstance(context);
		final Flags flags = Flags.getInstance();
		Log.d(TAG, "DyanmicShortcuts.initialize\nVERSION >= N_MR1? " +
		(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) +
		"\n" + Experiments.DYNAMIC_SHORTCUTS + " enabled? " +
		@@ -420,7 +420,7 @@ public class DynamicShortcuts {

		final DynamicShortcuts shortcuts = new DynamicShortcuts(context);

		if (!Flags.getInstance(context).getBoolean(Experiments.DYNAMIC_SHORTCUTS)) {
		if (!Flags.getInstance().getBoolean(Experiments.DYNAMIC_SHORTCUTS)) {
		// Clear dynamic shortcuts if the flag is not enabled. This prevents shortcuts from
		// staying around if it is enabled then later disabled (due to bugs for instance).
		shortcuts.handleFlagDisabled();

+3 −3

Original line number	Diff line number	Diff line
		@@ -439,7 +439,7 @@ public class PeopleActivity extends ContactsDrawerActivity {

		super.onPause();

		if (Flags.getInstance(this).getBoolean(Experiments.PULL_TO_REFRESH)) {
		if (Flags.getInstance().getBoolean(Experiments.PULL_TO_REFRESH)) {
		ContentResolver.removeStatusChangeListener(mStatusChangeListenerHandle);
		onSyncStateUpdated();
		}
		@@ -456,7 +456,7 @@ public class PeopleActivity extends ContactsDrawerActivity {
		mProviderStatusWatcher.start();
		updateViewConfiguration(true);

		if (Flags.getInstance(this).getBoolean(Experiments.PULL_TO_REFRESH)) {
		if (Flags.getInstance().getBoolean(Experiments.PULL_TO_REFRESH)) {
		mStatusChangeListenerHandle = ContentResolver.addStatusChangeListener(
		ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE
		\| ContentResolver.SYNC_OBSERVER_TYPE_PENDING
		@@ -792,7 +792,7 @@ public class PeopleActivity extends ContactsDrawerActivity {
		R.id.contacts_list_container, mMembersFragment, TAG_GROUP_VIEW);
		} else if(isAssistantView()) {
		String fragmentTag;
		if (Flags.getInstance(this).getBoolean(Experiments.ASSISTANT)) {
		if (Flags.getInstance().getBoolean(Experiments.ASSISTANT)) {
		fragmentTag = TAG_ASSISTANT;
		} else {
		fragmentTag = TAG_DUPLICATES;

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ public class DefaultContactListAdapter extends ContactListAdapter {
		loader.setUri(builder.build());
		loader.setProjection(getProjection(true));
		sortOrder = STREQUENT_SORT;
		if (Flags.getInstance(getContext()).getBoolean(Experiments.SEARCH_YENTA)
		if (Flags.getInstance().getBoolean(Experiments.SEARCH_YENTA)
		&& loader instanceof FavoritesAndContactsLoader
		&& directoryId == Directory.DEFAULT) {
		final FavoritesAndContactsLoader favoritesAndContactsLoader =