summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnne Rong <annerong@google.com>2015-09-22 18:20:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-22 18:20:31 +0000
commit79bd6ef7884470f2c509c526b8a3cf6acde1821d (patch)
tree53a344afea12a9bf2fd1d781fc718a3f712b902c
parent8bc7e10eb77380a8eb0f1a0c8ff862fc24d419aa (diff)
parent2b5c6c275b9441b0140a24cbe4897a61e714c824 (diff)
am 2b5c6c27: Merge "Fix snackbar using out of scope View in blocked numbers list." into ub-contactsdialer-a-dev
* commit '2b5c6c275b9441b0140a24cbe4897a61e714c824': Fix snackbar using out of scope View in blocked numbers list.
-rw-r--r--res/layout/blocked_number_fragment.xml1
-rw-r--r--src/com/android/dialer/filterednumber/BlockedNumberAdapter.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/res/layout/blocked_number_fragment.xml b/res/layout/blocked_number_fragment.xml
index b1e4d0f57..bbface6de 100644
--- a/res/layout/blocked_number_fragment.xml
+++ b/res/layout/blocked_number_fragment.xml
@@ -15,6 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/blocked_number_fragment"
android:orientation="vertical"
android:background="@color/blocked_number_background"
android:layout_width="match_parent"
diff --git a/src/com/android/dialer/filterednumber/BlockedNumberAdapter.java b/src/com/android/dialer/filterednumber/BlockedNumberAdapter.java
index 504b5205b..5041ed849 100644
--- a/src/com/android/dialer/filterednumber/BlockedNumberAdapter.java
+++ b/src/com/android/dialer/filterednumber/BlockedNumberAdapter.java
@@ -89,7 +89,8 @@ public class BlockedNumberAdapter extends SimpleCursorAdapter {
FilterNumberDialogFragment.newInstance(id, normalizedNumber, number,
countryIso, displayNumber);
newFragment.setQueryHandler(mFilteredNumberAsyncQueryHandler);
- newFragment.setParentView(view);
+ newFragment.setParentView(
+ ((Activity) mContext).findViewById(R.id.blocked_number_fragment));
newFragment.show(((Activity) mContext).getFragmentManager(),
FilterNumberDialogFragment.BLOCK_DIALOG_FRAGMENT);
}