diff options
author | Stephen Bird <sbird@cyngn.com> | 2016-05-02 09:39:57 -0700 |
---|---|---|
committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-05-09 08:58:38 -0700 |
commit | 1513c75c14068c3a43f66ffa2431572896c76c96 (patch) | |
tree | 7329a892e8e88e98188ed6bed4a4dda2939f3dae /src/com/android/incallui/CallCardFragment.java | |
parent | f023f97370cfbe775a1fab04da3699e0f82c066b (diff) | |
download | packages_apps_InCallUI-1513c75c14068c3a43f66ffa2431572896c76c96.tar.gz packages_apps_InCallUI-1513c75c14068c3a43f66ffa2431572896c76c96.tar.bz2 packages_apps_InCallUI-1513c75c14068c3a43f66ffa2431572896c76c96.zip |
Move Mod plugins out of CallButtonFragment to ModButtonFragment
Things were getting crowded.
Add a new button bar explicitly for plugins.
Tickets CD-592 & NOTES-101
Change-Id: I1bdf074d8e3417161eb29cf05140016b084c5006
Diffstat (limited to 'src/com/android/incallui/CallCardFragment.java')
-rw-r--r-- | src/com/android/incallui/CallCardFragment.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java index 498d13aa..c64f200b 100644 --- a/src/com/android/incallui/CallCardFragment.java +++ b/src/com/android/incallui/CallCardFragment.java @@ -132,6 +132,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr // Container view that houses the primary call information private ViewGroup mPrimaryCallInfo; private View mCallButtonsContainer; + private View mModButtonsContainer; private TextView mRecordingTimeLabel; private TextView mRecordingIcon; @@ -284,6 +285,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mPrimaryCallCardContainer = view.findViewById(R.id.primary_call_info_container); mPrimaryCallInfo = (ViewGroup) view.findViewById(R.id.primary_call_banner); mCallButtonsContainer = view.findViewById(R.id.callButtonFragment); + mModButtonsContainer = view.findViewById(R.id.modButtonFragment); mInCallMessageLabel = (TextView) view.findViewById(R.id.connectionServiceMessage); mProgressSpinner = view.findViewById(R.id.progressSpinner); @@ -1225,6 +1227,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mPrimaryCallCardContainer.setBackgroundColor(themeColors.mPrimaryColor); } mCallButtonsContainer.setBackgroundColor(themeColors.mPrimaryColor); + mModButtonsContainer.setBackgroundColor(themeColors.mSecondaryColor); mCallSubject.setTextColor(themeColors.mPrimaryColor); mCurrentThemeColors = themeColors; @@ -1272,6 +1275,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mFloatingActionButtonController.setScreenWidth(parent.getWidth()); mCallButtonsContainer.setAlpha(0); + mModButtonsContainer.setAlpha(0); mCallStateLabel.setAlpha(0); mPrimaryName.setAlpha(0); mCallTypeLabel.setAlpha(0); @@ -1283,6 +1287,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr assignTranslateAnimation(mCallNumberAndLabel, 3); assignTranslateAnimation(mCallTypeLabel, 4); assignTranslateAnimation(mCallButtonsContainer, 5); + assignTranslateAnimation(mModButtonsContainer, 6); final Animator animator = getShrinkAnimator(parent.getHeight(), originalHeight); @@ -1480,6 +1485,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr private void setViewStatePostAnimation(OnLayoutChangeListener layoutChangeListener) { setViewStatePostAnimation(mCallButtonsContainer); + setViewStatePostAnimation(mModButtonsContainer); setViewStatePostAnimation(mCallStateLabel); setViewStatePostAnimation(mPrimaryName); setViewStatePostAnimation(mCallTypeLabel); |