Update system setting page subtext
- Move android version from about phone subtext to system update - Updates strings for autofill, keyboard & input, factory reset, swipe for notification - Add a new pref category for spell checker and personal dictionary - Display "None" if any default app is not selected - Display current keyboard type as language subtext Bug: 36395109 Test: make RunSettingsRoboTests Change-Id: Id6ca94ea31e55f1c1ec04e47dcf657a25c35c7fe
This commit is contained in:
@@ -16,21 +16,26 @@
|
||||
package com.android.settings.deviceinfo;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Build;
|
||||
import android.os.UserManager;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
|
||||
import static org.mockito.Matchers.any;
|
||||
@@ -91,6 +96,18 @@ public class SystemUpdatePreferenceControllerTest {
|
||||
verify(mScreen).removePreference(any(Preference.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_shouldSetToAndroidVersion() {
|
||||
final Preference preference = new Preference(RuntimeEnvironment.application);
|
||||
mController = new SystemUpdatePreferenceController(
|
||||
RuntimeEnvironment.application, mUserManager);
|
||||
mController.updateState(preference);
|
||||
|
||||
assertThat(preference.getSummary())
|
||||
.isEqualTo(RuntimeEnvironment.application.getString(R.string.about_summary,
|
||||
Build.VERSION.RELEASE));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPrefs_oneAvailable_shouldDisplayOne() {
|
||||
final Preference preference = mock(Preference.class);
|
||||
|
||||
Reference in New Issue
Block a user