diff options
Diffstat (limited to 'java/com/android/dialer/app/DialtactsActivity.java')
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index 9144fc939..2d82b6f33 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -1555,6 +1555,10 @@ public class DialtactsActivity extends TransactionSafeActivity @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + // FAB does not move with the new favorites UI + if (newFavoritesIsEnabled()) { + return; + } int tabIndex = mListsFragment.getCurrentTabIndex(); // Scroll the button from center to end when moving from the Speed Dial to Call History tab. @@ -1615,7 +1619,8 @@ public class DialtactsActivity extends TransactionSafeActivity @VisibleForTesting public int getFabAlignment() { - if (!mIsLandscape + if (!newFavoritesIsEnabled() + && !mIsLandscape && !isInSearchUi() && mListsFragment.getCurrentTabIndex() == DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL) { return FloatingActionButtonController.ALIGN_MIDDLE; @@ -1746,4 +1751,8 @@ public class DialtactsActivity extends TransactionSafeActivity static void setVoiceSearchEnabledForTest(Optional<Boolean> enabled) { sVoiceSearchEnabledForTest = enabled; } + + private boolean newFavoritesIsEnabled() { + return ConfigProviderBindings.get(this).getBoolean("enable_new_favorites_tab", false); + } } |