Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d588387e authored by calderwoodra's avatar calderwoodra Committed by Copybara-Service
Browse files

InCallActivity#isDialpadVisible() now returns the correct value. 

Bug: 64657832
Test: manual/logging
PiperOrigin-RevId: 178824989
Change-Id: I202389123732c05680ba329313e889437fb4a806
parent bdef88bb

java/com/android/incallui/DialpadFragment.java

+0 −9
Original line number Diff line number Diff line
@@ -202,15 +202,6 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadUi> 
    mDtmfDialerField.setText(PhoneNumberUtilsCompat.createTtsSpannable(text));

  }



  @Override

  public void setVisible(boolean on) {

    if (on) {

      getView().setVisibility(View.VISIBLE);

    } else {

      getView().setVisibility(View.INVISIBLE);

    }

  }



  /** Starts the slide up animation for the Dialpad keys when the Dialpad is revealed. */

  public void animateShowDialpad() {

    final DialpadView dialpadView = (DialpadView) getView().findViewById(R.id.dialpad_view);

java/com/android/incallui/DialpadPresenter.java

+0 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ public class DialpadPresenter extends Presenter<DialpadUi> 


  public interface DialpadUi extends Ui {



    void setVisible(boolean on);



    void appendDigitsToField(char digit);

  }

}

java/com/android/incallui/InCallActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.support.annotation.IntDef; 
import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import android.support.annotation.VisibleForTesting;

import android.support.v4.app.Fragment;

import android.support.v4.app.FragmentManager;

import android.support.v4.app.FragmentTransaction;

import android.support.v4.content.res.ResourcesCompat;
@@ -787,6 +786,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity 
      transaction.add(getDialpadContainerId(), new DialpadFragment(), Tags.DIALPAD_FRAGMENT);

    } else {

      transaction.show(dialpadFragment);

      dialpadFragment.setUserVisibleHint(true);

    }

    transaction.commitAllowingStateLoss();

    dialpadFragmentManager.executePendingTransactions();
@@ -801,19 +801,20 @@ public class InCallActivity extends TransactionSafeFragmentActivity 
      return;

    }



    Fragment dialpadFragment = dialpadFragmentManager.findFragmentByTag(Tags.DIALPAD_FRAGMENT);

    DialpadFragment dialpadFragment = getDialpadFragment();

    if (dialpadFragment != null) {

      FragmentTransaction transaction = dialpadFragmentManager.beginTransaction();

      transaction.hide(dialpadFragment);

      transaction.commitAllowingStateLoss();

      dialpadFragmentManager.executePendingTransactions();

      dialpadFragment.setUserVisibleHint(false);

    }

    updateNavigationBar(false /* isDialpadVisible */);

  }



  public boolean isDialpadVisible() {

    DialpadFragment dialpadFragment = getDialpadFragment();

    return dialpadFragment != null && dialpadFragment.isVisible();

    return dialpadFragment != null && dialpadFragment.getUserVisibleHint();

  }



  /** Returns the {@link DialpadFragment} that's shown by this activity, or {@code null} */