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

Commit 5f1a6a94 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Create a new string for keyboard disconnected state"

parents f0fce68a ee3b74a6
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -8732,6 +8732,9 @@
    <!-- Wi-Fi state - Disconnected [CHAR LIMIT=NONE] -->
    <string name="disconnected">Not connected</string>
    <!-- Physical keyboard state - Disconnected [CHAR LIMIT=NONE] -->
    <string name="keyboard_disconnected">Not connected</string>
    <!-- Summary of data usage [CHAR LIMIT=NONE] -->
    <string name="data_usage_summary_format"><xliff:g id="amount" example="50%">%1$s</xliff:g> of data used</string>
+3 −2
Original line number Diff line number Diff line
@@ -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<HardKeyboardDeviceInfo> keyboards =
                PhysicalKeyboardFragment.getHardKeyboards(mContext);
        if (keyboards.isEmpty()) {
            mPreference.setSummary(R.string.disconnected);
            mPreference.setSummary(R.string.keyboard_disconnected);
            return;
        }
        String summary = null;
+3 −2
Original line number Diff line number Diff line
@@ -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