diff --git a/res/values/strings.xml b/res/values/strings.xml index ac64654bc44..d0b1cebfba6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8732,6 +8732,9 @@ Not connected + + Not connected + %1$s of data used diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index 38937de3b8e..9532fbc3f4c 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -31,6 +30,8 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; +import androidx.preference.Preference; + public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, InputManager.InputDeviceListener { @@ -96,7 +97,7 @@ public class PhysicalKeyboardPreferenceController extends AbstractPreferenceCont final List keyboards = PhysicalKeyboardFragment.getHardKeyboards(mContext); if (keyboards.isEmpty()) { - mPreference.setSummary(R.string.disconnected); + mPreference.setSummary(R.string.keyboard_disconnected); return; } String summary = null; diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index ca23fa5e8ce..d486644e044 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.hardware.input.InputManager; -import androidx.preference.Preference; import android.view.InputDevice; import com.android.settings.R; @@ -40,6 +39,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class PhysicalKeyboardPreferenceControllerTest { @@ -87,7 +88,7 @@ public class PhysicalKeyboardPreferenceControllerTest { ShadowInputDevice.sDeviceIds = new int[0]; mController.updateState(mPreference); - verify(mPreference).setSummary(R.string.disconnected); + verify(mPreference).setSummary(R.string.keyboard_disconnected); } @Test