Remove flags for removed opt-in server studies (1/2) (9adc9ef5) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/DynamicShortcuts.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -407,8 +407,6 @@ public class DynamicShortcuts {
		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? " +
		flags.getBoolean(Experiments.DYNAMIC_SHORTCUTS) +
		"\nisJobScheduled? " + isJobScheduled(context) +
		"\nminDelay=" +
		flags.getInteger(Experiments.DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS) +
		@@ -420,11 +418,7 @@ public class DynamicShortcuts {

		final DynamicShortcuts shortcuts = new DynamicShortcuts(context);

		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();
		} else if (!shortcuts.hasRequiredPermissions()) {
		if (!shortcuts.hasRequiredPermissions()) {
		final IntentFilter filter = new IntentFilter();
		filter.addAction(RequestPermissionsActivity.BROADCAST_PERMISSIONS_GRANTED);
		LocalBroadcastManager.getInstance(shortcuts.mContext).registerReceiver(

+9 −12

Original line number	Diff line number	Diff line
		@@ -449,11 +449,9 @@ public class PeopleActivity extends ContactsDrawerActivity {

		super.onPause();

		if (Flags.getInstance().getBoolean(Experiments.PULL_TO_REFRESH)) {
		ContentResolver.removeStatusChangeListener(mStatusChangeListenerHandle);
		onSyncStateUpdated();
		}
		}

		@Override
		public void onMultiWindowModeChanged(boolean entering) {
		@@ -471,14 +469,13 @@ public class PeopleActivity extends ContactsDrawerActivity {
		mProviderStatusWatcher.start();
		updateViewConfiguration(true);

		if (Flags.getInstance().getBoolean(Experiments.PULL_TO_REFRESH)) {
		mStatusChangeListenerHandle = ContentResolver.addStatusChangeListener(
		ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE
		\| ContentResolver.SYNC_OBSERVER_TYPE_PENDING
		\| ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS,
		mSyncStatusObserver);
		onSyncStateUpdated();
		}

		initializeFabVisibility();
		initializeHomeVisibility();

+0 −20

Original line number	Diff line number	Diff line
		@@ -25,11 +25,6 @@ public final class Experiments {
		*/
		public static final String ASSISTANT = "Assistant__enable_assistant";

		/**
		* Experiment to show the restore assistant on the assistants view.
		*/
		public static final String ASSISTANT_RESTORE = "Assistant__restore";

		/**
		* Whether to open contact sheet (aka smart profile) instead of our own QuickContact.
		*/
		@@ -47,22 +42,12 @@ public final class Experiments {
		public static final String DYNAMIC_MIN_CONTENT_CHANGE_UPDATE_DELAY_MILLIS =
		"Shortcuts__dynamic_min_content_change_update_delay_millis";

		/**
		* Experiment to enable dynamic strequent shortcuts.
		*/
		public static final String DYNAMIC_SHORTCUTS = "Shortcuts__dynamic_shortcuts";

		/**
		* Experiment to enable device account detection using CP2 queries
		*/
		public static final String OEM_CP2_DEVICE_ACCOUNT_DETECTION_ENABLED =
		"OEM__cp2_device_account_detection_enabled";

		/**
		* Experiment to toggle contacts sync using the pull to refresh gesture.
		*/
		public static final String PULL_TO_REFRESH = "PullToRefresh__pull_to_refresh";

		/**
		* Flags for maximum time to show spinner for a contacts sync.
		*/
		@@ -79,11 +64,6 @@ public final class Experiments {
		*/
		public static final String SEARCH_YENTA_TIMEOUT_MILLIS = "Search__yenta_timeout";

		/**
		* The options for sending email/messages to groups and selections
		*/
		public static final String SEND_TO_GROUP = "Groups__send_to_group";

		private Experiments() {
		}
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -268,13 +268,9 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM
		final boolean isSelectionMode = mActionBarAdapter.isSelectionMode();
		final boolean isGroupEditable = mGroupMetaData != null && mGroupMetaData.editable;
		final boolean isGroupReadOnly = mGroupMetaData != null && mGroupMetaData.readOnly;
		final boolean experimentFlagSet =
		Flags.getInstance().getBoolean(Experiments.SEND_TO_GROUP);

		setVisible(menu, R.id.menu_multi_send_email, !mIsEditMode && !isGroupEmpty()
		&& experimentFlagSet);
		setVisible(menu, R.id.menu_multi_send_message, !mIsEditMode && !isGroupEmpty()
		&& experimentFlagSet);
		setVisible(menu, R.id.menu_multi_send_email, !mIsEditMode && !isGroupEmpty());
		setVisible(menu, R.id.menu_multi_send_message, !mIsEditMode && !isGroupEmpty());
		setVisible(menu, R.id.menu_add, isGroupEditable && !isSelectionMode);
		setVisible(menu, R.id.menu_rename_group, !isGroupReadOnly && !isSelectionMode);
		setVisible(menu, R.id.menu_delete_group, !isGroupReadOnly && !isSelectionMode);

+4 −9

Original line number	Diff line number	Diff line
		@@ -190,9 +190,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
		setSyncOffAlert();

		// Determine whether the account has pullToRefresh feature
		if (Flags.getInstance().getBoolean(Experiments.PULL_TO_REFRESH)) {
		setSwipeRefreshLayoutEnabledOrNot(getFilter());
		}
		break;
		case ActionBarAdapter.Listener.Action.CHANGE_SEARCH_QUERY:
		final String queryString = mActionBarAdapter.getQueryString();
		@@ -464,9 +462,8 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
		protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
		super.onCreateView(inflater, container);

		if (Flags.getInstance().getBoolean(Experiments.PULL_TO_REFRESH)) {
		initSwipeRefreshLayout();
		}

		// Putting the header view inside a container will allow us to make
		// it invisible later. See checkHeaderViewVisibility()
		final FrameLayout headerContainer = new FrameLayout(inflater.getContext());
		@@ -834,10 +831,8 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment
		setSyncOffAlert();

		// Determine whether the account has pullToRefresh feature
		if (Flags.getInstance().getBoolean(Experiments.PULL_TO_REFRESH)) {
		setSwipeRefreshLayoutEnabledOrNot(filter);
		}
		}

		private void setSwipeRefreshLayoutEnabledOrNot(ContactListFilter filter) {
		final SwipeRefreshLayout swipeRefreshLayout = getSwipeRefreshLayout();