summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/main
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2018-02-26 10:56:21 -0800
committerCopybara-Service <copybara-piper@google.com>2018-02-26 10:57:18 -0800
commit719341fb552ddb1b1e955e0f8ace79ffc0491b67 (patch)
treed570f076bea55bc2446a3edd3c50d1b6bc023d8a /java/com/android/dialer/main
parent19a126b0c12c0ea93ffe7f60f3250e81aa305785 (diff)
Implement logic of bottom sheet options related to spam numbers.
Bug: 70989605 Test: ShowBlockReportSpamDialogNotifierEndToEndTest + Manual PiperOrigin-RevId: 187047450 Change-Id: I23c3929135bcfe5c14fe317ef65f628dc126027f
Diffstat (limited to 'java/com/android/dialer/main')
-rw-r--r--java/com/android/dialer/main/MainActivityPeer.java2
-rw-r--r--java/com/android/dialer/main/impl/MainActivity.java6
-rw-r--r--java/com/android/dialer/main/impl/NewMainActivityPeer.java17
-rw-r--r--java/com/android/dialer/main/impl/OldMainActivityPeer.java3
4 files changed, 27 insertions, 1 deletions
diff --git a/java/com/android/dialer/main/MainActivityPeer.java b/java/com/android/dialer/main/MainActivityPeer.java
index 9c5627be8..31af9adbd 100644
--- a/java/com/android/dialer/main/MainActivityPeer.java
+++ b/java/com/android/dialer/main/MainActivityPeer.java
@@ -28,6 +28,8 @@ public interface MainActivityPeer {
void onUserLeaveHint();
+ void onActivityPause();
+
void onActivityStop();
void onActivityDestroyed();
diff --git a/java/com/android/dialer/main/impl/MainActivity.java b/java/com/android/dialer/main/impl/MainActivity.java
index 1646becf4..fbcbeff38 100644
--- a/java/com/android/dialer/main/impl/MainActivity.java
+++ b/java/com/android/dialer/main/impl/MainActivity.java
@@ -99,6 +99,12 @@ public class MainActivity extends TransactionSafeActivity
}
@Override
+ protected void onPause() {
+ super.onPause();
+ activePeer.onActivityPause();
+ }
+
+ @Override
protected void onStop() {
super.onStop();
activePeer.onActivityStop();
diff --git a/java/com/android/dialer/main/impl/NewMainActivityPeer.java b/java/com/android/dialer/main/impl/NewMainActivityPeer.java
index 6f5c18623..081559a2b 100644
--- a/java/com/android/dialer/main/impl/NewMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/NewMainActivityPeer.java
@@ -22,6 +22,8 @@ import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.LocalBroadcastManager;
+import com.android.dialer.blockreportspam.ShowBlockReportSpamDialogReceiver;
import com.android.dialer.calllog.CallLogComponent;
import com.android.dialer.calllog.ui.NewCallLogFragment;
import com.android.dialer.common.concurrent.DefaultFutureCallback;
@@ -37,9 +39,12 @@ import com.google.common.util.concurrent.MoreExecutors;
public class NewMainActivityPeer implements MainActivityPeer {
private final MainActivity mainActivity;
+ private final ShowBlockReportSpamDialogReceiver showBlockReportSpamDialogReceiver;
public NewMainActivityPeer(MainActivity mainActivity) {
this.mainActivity = mainActivity;
+ this.showBlockReportSpamDialogReceiver =
+ new ShowBlockReportSpamDialogReceiver(mainActivity.getFragmentManager());
}
@Override
@@ -54,12 +59,22 @@ public class NewMainActivityPeer implements MainActivityPeer {
}
@Override
- public void onActivityResume() {}
+ public void onActivityResume() {
+ LocalBroadcastManager.getInstance(mainActivity)
+ .registerReceiver(
+ showBlockReportSpamDialogReceiver, ShowBlockReportSpamDialogReceiver.getIntentFilter());
+ }
@Override
public void onUserLeaveHint() {}
@Override
+ public void onActivityPause() {
+ LocalBroadcastManager.getInstance(mainActivity)
+ .unregisterReceiver(showBlockReportSpamDialogReceiver);
+ }
+
+ @Override
public void onActivityStop() {}
@Override
diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
index cdbab5cc1..9ceea28bf 100644
--- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
@@ -398,6 +398,9 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
}
@Override
+ public void onActivityPause() {}
+
+ @Override
public void onActivityStop() {
lastTabController.onActivityStop();
callLogFragmentListener.onActivityStop(