From f53ba7be0531904a25c15f69c8e1bfdea88be869 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Mon, 12 Mar 2018 18:30:32 -0700 Subject: Keyboard and search now close when appropriate. Keyboard should close when: - requeting permission - placing a call - leaving the app Search should close when: - placing a call - leaving the app Bug: 74235853 Test: search closing onPause tests already exist (MainActivityOldPeerSearchIntegrationTest#placingCallFromSearchClosesSearch) PiperOrigin-RevId: 188812026 Change-Id: Iaee084c59b4c514d10375deff5d73d5a456ef9df --- .../android/dialer/searchfragment/list/NewSearchFragment.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'java/com/android/dialer/searchfragment') diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java index aff946206..6a60598a7 100644 --- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java +++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java @@ -29,7 +29,6 @@ import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; -import android.support.v13.app.FragmentCompat; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.telephony.PhoneNumberUtils; @@ -342,8 +341,8 @@ public final class NewSearchFragment extends Fragment LogUtil.i( "NewSearchFragment.onEmptyViewActionButtonClicked", "Requesting permissions: " + Arrays.toString(deniedPermissions)); - FragmentCompat.requestPermissions( - this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE); + FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).requestingPermission(); + requestPermissions(deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE); } } @@ -411,6 +410,7 @@ public final class NewSearchFragment extends Fragment String[] deniedPermissions = PermissionsUtil.getPermissionsCurrentlyDenied( getContext(), PermissionsUtil.allLocationGroupPermissionsUsedInDialer); + FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).requestingPermission(); requestPermissions(deniedPermissions, LOCATION_PERMISSION_REQUEST_CODE); } @@ -557,5 +557,8 @@ public final class NewSearchFragment extends Fragment /** Called when a call is placed from the search fragment. */ void onCallPlacedFromSearch(); + + /** Called when a permission is about to be requested. */ + void requestingPermission(); } } -- cgit v1.2.3