Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e97b45 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] Show dialogs when lifecycle isAtLeast STARTED" into main

parents d3759847 57355a07

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.lifecycle.Lifecycle;



import com.android.settings.R;

import com.android.settings.bluetooth.BluetoothPairingDetail;
@@ -95,6 +96,11 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment { 
            Log.d(TAG, "Fail to show dialog: " + e.getMessage());

            return;

        }

        Lifecycle.State currentState = host.getLifecycle().getCurrentState();

        if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {

            Log.d(TAG, "Fail to show dialog with state: " + currentState);

            return;

        }

        sHost = host;

        sListener = listener;

        sEventData = eventData;

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.lifecycle.Lifecycle;



import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -92,6 +93,11 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag 
            Log.d(TAG, "Fail to show dialog: " + e.getMessage());

            return;

        }

        Lifecycle.State currentState = host.getLifecycle().getCurrentState();

        if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {

            Log.d(TAG, "Fail to show dialog with state: " + currentState);

            return;

        }

        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);

        if (dialog != null) {

            int newGroupId = BluetoothUtils.getGroupId(newDevice);

src/com/android/settings/connecteddevice/audiosharing/AudioSharingErrorDialogFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.annotation.Nullable; 
import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.lifecycle.Lifecycle;



import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -53,6 +54,11 @@ public class AudioSharingErrorDialogFragment extends InstrumentedDialogFragment 
            Log.d(TAG, "Fail to show dialog: " + e.getMessage());

            return;

        }

        Lifecycle.State currentState = host.getLifecycle().getCurrentState();

        if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {

            Log.d(TAG, "Fail to show dialog with state: " + currentState);

            return;

        }

        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);

        if (dialog != null) {

            Log.d(TAG, "Dialog is showing, return.");

src/com/android/settings/connecteddevice/audiosharing/AudioSharingIncompatibleDialogFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.annotation.Nullable; 
import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.lifecycle.Lifecycle;



import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -69,6 +70,11 @@ public class AudioSharingIncompatibleDialogFragment extends InstrumentedDialogFr 
            Log.d(TAG, "Fail to show dialog: " + e.getMessage());

            return;

        }

        Lifecycle.State currentState = host.getLifecycle().getCurrentState();

        if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {

            Log.d(TAG, "Fail to show dialog with state: " + currentState);

            return;

        }

        sListener = listener;

        AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);

        if (dialog != null) {

src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.lifecycle.Lifecycle;



import com.android.settings.R;

import com.android.settings.bluetooth.Utils;
@@ -89,6 +90,11 @@ public class AudioSharingJoinDialogFragment extends InstrumentedDialogFragment { 
            Log.d(TAG, "Fail to show dialog: " + e.getMessage());

            return;

        }

        Lifecycle.State currentState = host.getLifecycle().getCurrentState();

        if (!currentState.isAtLeast(Lifecycle.State.STARTED)) {

            Log.d(TAG, "Fail to show dialog with state: " + currentState);

            return;

        }

        sListener = listener;

        sNewDevice = newDevice;

        sEventData = eventData;