Merge "[DO NOT MERGE] Let voicemail broadcast test pass if it is not applicable." into oreo-mr1-cts-dev
diff --git a/apps/CtsVerifier/res/layout/voicemail_broadcast.xml b/apps/CtsVerifier/res/layout/voicemail_broadcast.xml
index 163da23..0cf1d39 100644
--- a/apps/CtsVerifier/res/layout/voicemail_broadcast.xml
+++ b/apps/CtsVerifier/res/layout/voicemail_broadcast.xml
@@ -58,6 +58,12 @@
android:layout_height="wrap_content"
android:text="@string/voicemail_set_default_dialer_button"/>
+ <Button
+ android:id="@+id/call_settings_check_not_applicable"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/visual_voicemail_service_remove_sim_not_applicable"/>
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java
index 3cf34fa..b54637b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java
@@ -29,6 +29,8 @@
import com.android.cts.verifier.R;
import com.android.cts.verifier.voicemail.VoicemailBroadcastReceiver.ReceivedListener;
+import android.view.View.OnClickListener;
+import android.widget.Button;
/**
* This test ask the tester to set the CTS verifier as the default dialer and leave a voicemail. The
* test will pass if the verifier is able to receive a broadcast for the incoming voicemail. This
@@ -38,7 +40,9 @@
public class VoicemailBroadcastActivity extends PassFailButtons.Activity {
private ImageView mLeaveVoicemailImage;
+ private ImageView mRestoreDefaultDialerImage;
private TextView mLeaveVoicemailText;
+ private Button mNotApplicableButton;
private DefaultDialerChanger mDefaultDialerChanger;
@@ -53,10 +57,23 @@
getPassButton().setEnabled(false);
mLeaveVoicemailImage = (ImageView) findViewById(R.id.leave_voicemail_image);
+ mRestoreDefaultDialerImage = (ImageView) findViewById(R.id.restore_default_dialer_image);
mLeaveVoicemailText = (TextView) findViewById(R.id.leave_voicemail_text);
mDefaultDialerChanger = new DefaultDialerChanger(this);
+ mNotApplicableButton = findViewById(R.id.call_settings_check_not_applicable);
+ mNotApplicableButton.setOnClickListener(
+ new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ getPassButton().setEnabled(true);
+ mLeaveVoicemailImage.setImageDrawable(getDrawable(R.drawable.fs_warning));
+ mRestoreDefaultDialerImage.setImageDrawable(getDrawable(R.drawable.fs_warning));
+ }
+ }
+ );
+
VoicemailBroadcastReceiver.setListener(new ReceivedListener() {
@Override
public void onReceived() {