summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/list/SpeedDialFragment.java
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-03-25 03:21:06 -0700
committerSteve Kondik <steve@cyngn.com>2015-03-25 03:21:06 -0700
commit8fe1a3122c833a954318046b3f7b093f553ae888 (patch)
treeda894efce8014842cb162053f81b508c4634d9fc /src/com/android/dialer/list/SpeedDialFragment.java
parentbee9691aecaa8913866692424a028f70883a9095 (diff)
parent17c2f110847c21bcc923f7b3312b06203aa79798 (diff)
downloadandroid_packages_apps_Dialer-8fe1a3122c833a954318046b3f7b093f553ae888.tar.gz
android_packages_apps_Dialer-8fe1a3122c833a954318046b3f7b093f553ae888.tar.bz2
android_packages_apps_Dialer-8fe1a3122c833a954318046b3f7b093f553ae888.zip
Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/Dialer into cm-12.1
Change-Id: I594cec327dc6b576d765ba497fca0db6f91aa3ba
Diffstat (limited to 'src/com/android/dialer/list/SpeedDialFragment.java')
-rw-r--r--src/com/android/dialer/list/SpeedDialFragment.java17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index e0635516a..63f1f34c6 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -19,6 +19,7 @@ import android.animation.Animator;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.app.Activity;
+import android.app.Fragment;
import android.app.LoaderManager;
import android.content.CursorLoader;
import android.content.Loader;
@@ -48,7 +49,6 @@ import com.android.contacts.common.list.ContactTileView;
import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
import com.android.dialer.R;
import com.android.dialer.util.DialerUtils;
-import com.android.dialerbind.analytics.AnalyticsFragment;
import java.util.ArrayList;
import java.util.HashMap;
@@ -56,7 +56,7 @@ import java.util.HashMap;
/**
* This fragment displays the user's favorite/frequent contacts in a grid.
*/
-public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickListener,
+public class SpeedDialFragment extends Fragment implements OnItemClickListener,
PhoneFavoritesTileAdapter.OnDataSetChangedForAnimationListener {
/**
@@ -150,8 +150,6 @@ public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickL
private View mContactTileFrame;
- private TileInteractionTeaserView mTileInteractionTeaserView;
-
private final HashMap<Long, Integer> mItemIdTopMap = new HashMap<Long, Integer>();
private final HashMap<Long, Integer> mItemIdLeftMap = new HashMap<Long, Integer>();
@@ -217,9 +215,6 @@ public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickL
mContactTileFrame = mParentView.findViewById(R.id.contact_tile_frame);
- mTileInteractionTeaserView = (TileInteractionTeaserView) inflater.inflate(
- R.layout.tile_interactions_teaser_view, mListView, false);
-
final LayoutAnimationController controller = new LayoutAnimationController(
AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in));
controller.setDelay(0);
@@ -240,14 +235,16 @@ public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickL
/* package */ void setEmptyViewVisibility(final boolean visible) {
final int previousVisibility = mEmptyView.getVisibility();
- final int newVisibility = visible ? View.VISIBLE : View.GONE;
+ final int emptyViewVisibility = visible ? View.VISIBLE : View.GONE;
+ final int listViewVisibility = visible ? View.GONE : View.VISIBLE;
- if (previousVisibility != newVisibility) {
+ if (previousVisibility != emptyViewVisibility) {
final RelativeLayout.LayoutParams params = (LayoutParams) mContactTileFrame
.getLayoutParams();
params.height = visible ? LayoutParams.WRAP_CONTENT : LayoutParams.MATCH_PARENT;
mContactTileFrame.setLayoutParams(params);
- mEmptyView.setVisibility(newVisibility);
+ mEmptyView.setVisibility(emptyViewVisibility);
+ mListView.setVisibility(listViewVisibility);
}
}