diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index 1c7566948e2..d42a1bed280 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -66,7 +66,7 @@ public class BluetoothDeviceRenamePreferenceController extends if (TextUtils.equals(getPreferenceKey(), preference.getKey()) && mFragment != null) { mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_BLUETOOTH_RENAME); - LocalDeviceNameDialogFragment.newInstance() + new LocalDeviceNameDialogFragment() .show(mFragment.getFragmentManager(), LocalDeviceNameDialogFragment.TAG); return true; } diff --git a/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java index 5cf2ccc314c..c15dd04ae52 100644 --- a/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java @@ -31,10 +31,6 @@ public class LocalDeviceNameDialogFragment extends BluetoothNameDialogFragment { public static final String TAG = "LocalAdapterName"; private BluetoothAdapter mBluetoothAdapter; - public static LocalDeviceNameDialogFragment newInstance() { - return new LocalDeviceNameDialogFragment(); - } - private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java deleted file mode 100644 index 9a6ad9194ed..00000000000 --- a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.bluetooth; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.view.View; -import android.view.inputmethod.InputMethodManager; - -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - -import com.android.settings.R; -import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; -import com.android.settingslib.bluetooth.LocalBluetoothManager; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -import org.robolectric.shadows.androidx.fragment.FragmentController; -import org.robolectric.util.ReflectionHelpers; - -@RunWith(RobolectricTestRunner.class) -@Config(shadows = ShadowAlertDialogCompat.class) -public class LocalDeviceNameDialogFragmentTest { - - @Mock - private InputMethodManager mInputMethodManager; - - private Context mContext; - private LocalDeviceNameDialogFragment mFragment; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application); - doReturn(mInputMethodManager).when(mContext).getSystemService(Context.INPUT_METHOD_SERVICE); - - mFragment = spy(LocalDeviceNameDialogFragment.newInstance()); - when(mFragment.getContext()).thenReturn(mContext); - } - - @After - public void tearDown() { - ReflectionHelpers.setStaticField(LocalBluetoothManager.class, "sInstance", null); - } - - @Test - @Ignore("b/120505691") - public void dialogTriggersShowSoftInput() { - FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */, - null /* bundle */); - AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog(); - assertThat(dialog).isNotNull(); - View view = dialog.findViewById(R.id.edittext); - verify(mInputMethodManager).showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); - } -}