PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create a new string for keyboard disconnected state

Browse Source 
Change-Id: I454bbb3b8e0ee22c0f7a5a340b86dfd5607de86e
Fixes: 77957016
Test: robotests
This commit is contained in:
Fan Zhang
2018-04-23 14:58:39 -07:00
parent 02aaca9529
commit ee3b74a61f
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -8732,6 +8732,9 @@
<!-- Wi-Fi state - Disconnected [CHAR LIMIT=NONE] --> <!-- Wi-Fi state - Disconnected [CHAR LIMIT=NONE] -->
<string name="disconnected">Not connected</string> <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] --> <!-- 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> <string name="data_usage_summary_format"><xliff:g id="amount" example="50%">%1$s</xliff:g> of data used</string>

5
src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.inputmethod;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputManager; import android.hardware.input.InputManager;
import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
@@ -31,6 +30,8 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.List; import java.util.List;
import androidx.preference.Preference;
public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause,
InputManager.InputDeviceListener { InputManager.InputDeviceListener {
@@ -96,7 +97,7 @@ public class PhysicalKeyboardPreferenceController extends AbstractPreferenceCont
final List<HardKeyboardDeviceInfo> keyboards = final List<HardKeyboardDeviceInfo> keyboards =
PhysicalKeyboardFragment.getHardKeyboards(mContext); PhysicalKeyboardFragment.getHardKeyboards(mContext);
if (keyboards.isEmpty()) { if (keyboards.isEmpty()) {
mPreference.setSummary(R.string.disconnected); mPreference.setSummary(R.string.keyboard_disconnected);
return; return;
} }
String summary = null; String summary = null;

5
tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
View File

@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.hardware.input.InputManager; import android.hardware.input.InputManager;
import androidx.preference.Preference;
import android.view.InputDevice; import android.view.InputDevice;
import com.android.settings.R; import com.android.settings.R;
@@ -40,6 +39,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class PhysicalKeyboardPreferenceControllerTest { public class PhysicalKeyboardPreferenceControllerTest {
@@ -87,7 +88,7 @@ public class PhysicalKeyboardPreferenceControllerTest {
ShadowInputDevice.sDeviceIds = new int[0]; ShadowInputDevice.sDeviceIds = new int[0];
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setSummary(R.string.disconnected); verify(mPreference).setSummary(R.string.keyboard_disconnected);
} }
@Test @Test