diff options
| author | calderwoodra <calderwoodra@google.com> | 2017-12-12 15:29:12 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2017-12-12 16:16:47 -0800 |
| commit | d588387ecd4a26c0e5930652cf43371abe47ab74 (patch) | |
| tree | 7bc38fc7604a9145dd7236d445ce9888cd856a18 /java/com/android/incallui/InCallActivity.java | |
| parent | bdef88bb0c16889e7403c117ce90825f7ed7b9e4 (diff) | |
| download | android_packages_apps_Dialer-d588387ecd4a26c0e5930652cf43371abe47ab74.tar.gz android_packages_apps_Dialer-d588387ecd4a26c0e5930652cf43371abe47ab74.tar.bz2 android_packages_apps_Dialer-d588387ecd4a26c0e5930652cf43371abe47ab74.zip | |
InCallActivity#isDialpadVisible() now returns the correct value.
Bug: 64657832
Test: manual/logging
PiperOrigin-RevId: 178824989
Change-Id: I202389123732c05680ba329313e889437fb4a806
Diffstat (limited to 'java/com/android/incallui/InCallActivity.java')
| -rw-r--r-- | java/com/android/incallui/InCallActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 28ff7da60..47b5986a0 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -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} */ |