Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237"

This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.

Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6

1 files changed, 25 insertions, 14 deletions

diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 09979ebf9..96942a72c 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -35,7 +35,6 @@ import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.view.ViewPager;
@@ -52,6 +51,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnDragListener;
+import android.view.ViewTreeObserver;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.AbsListView.OnScrollListener;
@@ -392,11 +392,12 @@ public class DialtactsActivity extends TransactionSafeActivity
     mIsLandscape =
         getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
     mPreviouslySelectedTabIndex = ListsFragment.TAB_INDEX_SPEED_DIAL;
-    FloatingActionButton floatingActionButton =
-        (FloatingActionButton) findViewById(R.id.floating_action_button);
+    final View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container);
+    ImageButton floatingActionButton = (ImageButton) findViewById(R.id.floating_action_button);
     floatingActionButton.setOnClickListener(this);
     mFloatingActionButtonController =
-        new FloatingActionButtonController(this, floatingActionButton);
+        new FloatingActionButtonController(
+            this, floatingActionButtonContainer, floatingActionButton);
 
     ImageButton optionsMenuButton =
         (ImageButton) searchEditTextLayout.findViewById(R.id.dialtacts_options_menu_button);
@@ -442,13 +443,23 @@ public class DialtactsActivity extends TransactionSafeActivity
 
     mParentLayout = (CoordinatorLayout) findViewById(R.id.dialtacts_mainlayout);
     mParentLayout.setOnDragListener(new LayoutOnDragListener());
-    ViewUtil.doOnGlobalLayout(
-        floatingActionButton,
-        view -> {
-          int screenWidth = mParentLayout.getWidth();
-          mFloatingActionButtonController.setScreenWidth(screenWidth);
-          mFloatingActionButtonController.align(getFabAlignment(), false /* animate */);
-        });
+    floatingActionButtonContainer
+        .getViewTreeObserver()
+        .addOnGlobalLayoutListener(
+            new ViewTreeObserver.OnGlobalLayoutListener() {
+              @Override
+              public void onGlobalLayout() {
+                final ViewTreeObserver observer =
+                    floatingActionButtonContainer.getViewTreeObserver();
+                if (!observer.isAlive()) {
+                  return;
+                }
+                observer.removeOnGlobalLayoutListener(this);
+                int screenWidth = mParentLayout.getWidth();
+                mFloatingActionButtonController.setScreenWidth(screenWidth);
+                mFloatingActionButtonController.align(getFabAlignment(), false /* animate */);
+              }
+            });
 
     Trace.endSection();
 
@@ -1168,7 +1179,7 @@ public class DialtactsActivity extends TransactionSafeActivity
 
   private void showFabInSearchUi() {
     mFloatingActionButtonController.changeIcon(
-        getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null),
+        getResources().getDrawable(R.drawable.fab_ic_dial, null),
         getResources().getString(R.string.action_menu_dialpad_button));
     mFloatingActionButtonController.align(getFabAlignment(), false /* animate */);
     mFloatingActionButtonController.scaleIn(FAB_SCALE_IN_DELAY_MS);
@@ -1353,11 +1364,11 @@ public class DialtactsActivity extends TransactionSafeActivity
         && !mInRegularSearch
         && !mInDialpadSearch) {
       mFloatingActionButtonController.changeIcon(
-          getResources().getDrawable(R.drawable.quantum_ic_person_add_white_24, null),
+          getResources().getDrawable(R.drawable.ic_person_add_24dp, null),
           getResources().getString(R.string.search_shortcut_create_new_contact));
     } else {
       mFloatingActionButtonController.changeIcon(
-          getResources().getDrawable(R.drawable.quantum_ic_dialpad_white_24, null),
+          getResources().getDrawable(R.drawable.fab_ic_dial, null),
           getResources().getString(R.string.action_menu_dialpad_button));
     }
   }