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:
Fan Zhang
2017-03-21 15:15:27 -07:00
parent aaa042de4e
commit 3720e0c4f1
13 changed files with 148 additions and 62 deletions

View File

@@ -21,6 +21,7 @@ import android.content.Context;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
@@ -75,7 +76,7 @@ public class DefaultAppPreferenceControllerTest {
mController.updateState(mPreference);
verify(mPreference).setSummary(null);
verify(mPreference).setSummary(R.string.app_list_preference_none);
}
private static class TestPreferenceController extends DefaultAppPreferenceController {

View File

@@ -23,6 +23,7 @@ import android.os.UserManager;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.applications.PackageManagerWrapper;
@@ -75,7 +76,7 @@ public class DefaultAutofillPreferenceControllerTest {
final Preference pref = mock(Preference.class);
mController.updateState(pref);
verify(pref).setSummary(null);
verify(pref).setSummary(R.string.app_list_preference_none);
}
@Test

View File

@@ -23,6 +23,7 @@ import android.content.pm.ResolveInfo;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.applications.PackageManagerWrapper;
@@ -92,7 +93,7 @@ public class DefaultBrowserPreferenceControllerTest {
final Preference pref = mock(Preference.class);
mController.updateState(pref);
verify(pref).setSummary(null);
verify(pref).setSummary(R.string.app_list_preference_none);
}
@Test