diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-12 21:47:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-12 21:47:52 +0000 |
commit | 73e8c7676cc9c7efa61b7cb2c225968b48834c40 (patch) | |
tree | 2601567f5eea3f01c095e6e28936c499f12c5026 /src | |
parent | 48d0e836fd506fbf12c93e3ac233588e967b08d6 (diff) | |
parent | 0c66770b304d03367f093e1916cf565d9cf70146 (diff) |
Merge "Change search list background to grey."
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 7aaa89742..7f9200eb4 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -16,10 +16,7 @@ package com.android.dialer; -import android.animation.Animator; import android.animation.LayoutTransition; -import android.animation.Animator.AnimatorListener; -import android.animation.AnimatorListenerAdapter; import android.app.ActionBar; import android.app.Activity; import android.app.Fragment; @@ -133,6 +130,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private static final int ANIMATION_DURATION = 250; + private RelativeLayout parentLayout; + /** * Fragment containing the dialpad that slides into view */ @@ -154,7 +153,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private ListsFragment mListsFragment; private View mFloatingActionButton; - private View mMenuButton; private View mDialpadButton; private View mDialButton; @@ -203,6 +201,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private DialerDatabaseHelper mDialerDatabaseHelper; private DragDropController mDragDropController; + private int mDialerBackgroundColor; + private int mContactListBackgroundColor; + private class OverflowPopupMenu extends PopupMenu { public OverflowPopupMenu(Context context, View anchor) { super(context, anchor); @@ -364,8 +365,13 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mFirstLaunch = savedInstanceState.getBoolean(KEY_FIRST_LAUNCH); } - RelativeLayout parent = (RelativeLayout) findViewById(R.id.dialtacts_mainlayout); - parent.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING); + parentLayout = (RelativeLayout) findViewById(R.id.dialtacts_mainlayout); + parentLayout.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING); + parentLayout.setOnDragListener(new LayoutOnDragListener()); + + mDialerBackgroundColor = getResources().getColor(R.color.background_dialer_light); + mContactListBackgroundColor = + getResources().getColor(R.color.contact_list_background_color); mFragmentsFrame = findViewById(R.id.dialtacts_frame); @@ -381,8 +387,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mDialerDatabaseHelper = DatabaseHelperManager.getDatabaseHelper(this); SmartDialPrefix.initializeNanpSettings(this); - - findViewById(R.id.dialtacts_mainlayout).setOnDragListener(new LayoutOnDragListener()); } @Override @@ -625,6 +629,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O if (mListsFragment != null && mListsFragment.isResumed() && mListsFragment.isVisible()) { // If the favorites fragment is showing, fade to blank. mFragmentsFrame.animate().alpha(0.0f); + parentLayout.setBackgroundColor(mContactListBackgroundColor); } getActionBar().hide(); alignFloatingActionButtonMiddle(); @@ -650,6 +655,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O if (mListsFragment != null && mListsFragment.isVisible()) { mFragmentsFrame.animate().alpha(1.0f); + parentLayout.setBackgroundColor(mDialerBackgroundColor); + } getActionBar().show(); alignFloatingActionButtonByTab(mCurrentTabPosition); |