Change initial load animation of main list (9620d6a2) · Commits · e / os / android_packages_apps_Contacts

res/anim/slide_and_fade_in.xml

0 → 100644

+26 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2016 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.
			-->
			<set xmlns:android="http://schemas.android.com/apk/res/android"
			android:interpolator="@android:interpolator/linear_out_slow_in">
			<alpha
			android:duration="@integer/lists_on_load_animation_duration"
			android:fromAlpha="0.0"
			android:toAlpha="1.0"/>
			<translate
			android:duration="@integer/lists_on_load_animation_duration"
			android:fromYDelta="5%"
			android:toYDelta="0"/>
			</set>

res/anim/slide_and_fade_in_layout_animation.xml

0 → 100644

+18 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2016 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.
			-->
			<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
			android:animation="@anim/slide_and_fade_in"
			android:delay="10%"/>

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

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -402,6 +402,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements

	if (mAllFragment == null) {		if (mAllFragment == null) {
	mAllFragment = new DefaultContactBrowseListFragment();		mAllFragment = new DefaultContactBrowseListFragment();
			mAllFragment.setAnimateOnLoad(true);
	transaction.add(R.id.tab_pager, mAllFragment, ALL_TAG);		transaction.add(R.id.tab_pager, mAllFragment, ALL_TAG);
	}		}

	@@ -847,10 +848,6 @@ public class PeopleActivity extends ContactsDrawerActivity implements
	mCurTransaction = mFragmentManager.beginTransaction();		mCurTransaction = mFragmentManager.beginTransaction();
	}		}
	Fragment f = getFragment(position);		Fragment f = getFragment(position);
	if (!mIsRecreatedInstance && (f instanceof DefaultContactBrowseListFragment)) {
	mCurTransaction.setCustomAnimations(android.R.animator.fade_in,
	android.R.animator.fade_out);
	}
	mCurTransaction.show(f);		mCurTransaction.show(f);

	// Non primary pages are not visible.		// Non primary pages are not visible.

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

+51 −12

Original line number	Original line	Diff line number	Diff line
	@@ -16,18 +16,6 @@

	package com.android.contacts.list;		package com.android.contacts.list;

	import com.android.contacts.R;
	import com.android.contacts.common.list.ContactEntryListFragment;
	import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
	import com.android.contacts.common.list.MultiSelectEntryContactListAdapter.SelectedContactsListener;
	import com.android.contacts.common.logging.ListEvent.ActionType;
	import com.android.contacts.common.logging.Logger;
	import com.android.contacts.common.logging.SearchState;
	import com.android.contacts.common.model.AccountTypeManager;
	import com.android.contacts.common.model.account.AccountType;
	import com.android.contacts.common.model.account.AccountWithDataSet;
	import com.android.contacts.common.model.account.GoogleAccountType;

	import android.content.Context;		import android.content.Context;
	import android.database.Cursor;		import android.database.Cursor;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	@@ -35,13 +23,28 @@ import android.os.Bundle;
	import android.provider.ContactsContract;		import android.provider.ContactsContract;
	import android.support.v4.view.ViewCompat;		import android.support.v4.view.ViewCompat;
	import android.util.Log;		import android.util.Log;
			import android.view.LayoutInflater;
	import android.view.View;		import android.view.View;
	import android.view.ViewGroup;		import android.view.ViewGroup;
	import android.view.accessibility.AccessibilityEvent;		import android.view.accessibility.AccessibilityEvent;
			import android.view.animation.Animation;
			import android.view.animation.AnimationUtils;
	import android.widget.AbsListView;		import android.widget.AbsListView;
	import android.widget.ImageView;		import android.widget.ImageView;
	import android.widget.TextView;		import android.widget.TextView;

			import com.android.contacts.R;
			import com.android.contacts.common.list.ContactEntryListFragment;
			import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
			import com.android.contacts.common.list.MultiSelectEntryContactListAdapter.SelectedContactsListener;
			import com.android.contacts.common.logging.ListEvent.ActionType;
			import com.android.contacts.common.logging.Logger;
			import com.android.contacts.common.logging.SearchState;
			import com.android.contacts.common.model.AccountTypeManager;
			import com.android.contacts.common.model.account.AccountType;
			import com.android.contacts.common.model.account.AccountWithDataSet;
			import com.android.contacts.common.model.account.GoogleAccountType;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;
	import java.util.TreeSet;		import java.util.TreeSet;
	@@ -54,6 +57,7 @@ public abstract class MultiSelectContactsListFragment<T extends MultiSelectEntry
	extends ContactEntryListFragment<T>		extends ContactEntryListFragment<T>
	implements SelectedContactsListener {		implements SelectedContactsListener {

			protected boolean mAnimateOnLoad;
	private static final String TAG = "MultiContactsList";		private static final String TAG = "MultiContactsList";

	public interface OnCheckBoxListActionListener {		public interface OnCheckBoxListActionListener {
	@@ -89,11 +93,25 @@ public abstract class MultiSelectContactsListFragment<T extends MultiSelectEntry
	mSearchResultClicked = false;		mSearchResultClicked = false;
	}		}

			public void setAnimateOnLoad(boolean shouldAnimate) {
			mAnimateOnLoad = shouldAnimate;
			}

	@Override		@Override
	public void onSelectedContactsChanged() {		public void onSelectedContactsChanged() {
	if (mCheckBoxListListener != null) mCheckBoxListListener.onSelectedContactIdsChanged();		if (mCheckBoxListListener != null) mCheckBoxListListener.onSelectedContactIdsChanged();
	}		}

			@Override
			public View onCreateView(LayoutInflater inflater, ViewGroup container,
			Bundle savedInstanceState) {
			super.onCreateView(inflater, container, savedInstanceState);
			if (savedInstanceState == null && mAnimateOnLoad) {
			setLayoutAnimation(getListView(), R.anim.slide_and_fade_in_layout_animation);
			}
			return getView();
			}

	@Override		@Override
	public void onSelectedContactsChangedViaCheckBox() {		public void onSelectedContactsChangedViaCheckBox() {
	if (getAdapter().getSelectedContactIds().size() == 0) {		if (getAdapter().getSelectedContactIds().size() == 0) {
	@@ -283,6 +301,27 @@ public abstract class MultiSelectContactsListFragment<T extends MultiSelectEntry
	return searchState;		return searchState;
	}		}

			protected void setLayoutAnimation(final ViewGroup view, int animationId) {
			if (view == null) {
			return;
			}
			view.setLayoutAnimationListener(new Animation.AnimationListener() {
			@Override
			public void onAnimationStart(Animation animation) {
			}

			@Override
			public void onAnimationEnd(Animation animation) {
			view.setLayoutAnimation(null);
			}

			@Override
			public void onAnimationRepeat(Animation animation) {
			}
			});
			view.setLayoutAnimation(AnimationUtils.loadLayoutAnimation(getActivity(), animationId));
			}

	@Override		@Override
	public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,		public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
	int totalItemCount) {		int totalItemCount) {