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

Update system setting page subtext

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -565,8 +565,6 @@
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system"/>
<meta-data android:name="com.android.settings.summary"
android:resource="@string/summary_empty"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.language.LanguageAndInputSettings"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -945,6 +943,8 @@
android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/about_settings" />
<meta-data android:name="com.android.settings.summary"
android:resource="@string/summary_empty"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DeviceInfoSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

16
res/values/strings.xml
View File

@@ -2910,8 +2910,6 @@
<string name="reset_network_complete_toast">Network settings have been reset</string>
<!-- Master Clear -->
<!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
<string name="device_reset_title">Reset device</string>
<!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
<string name="master_clear_title">Factory data reset</string>
<!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -3769,6 +3767,8 @@
<string name="language_settings">Languages&#160;&amp; input</string>
<!-- Title of Languages & input settings screen -->
<string name="language_keyboard_settings_title">Languages&#160;&amp; input</string>
<!-- Title of preference category that lists all settings about helping user input such as spell checker [CHAR LIMIT=60]-->
<string name="input_assistance">Input assistance</string>
<!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
<string name="keyboard_settings_category">Keyboard &amp; input methods</string>
<!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
@@ -3815,7 +3815,7 @@
<string name="failed_to_open_app_settings_toast">Failed to open settings for <xliff:g id="spell_application_name">%1$s</xliff:g></string>
<!-- Title for the 'keyboard and input methods' preference category. [CHAR LIMIT=45] -->
<string name="keyboard_and_input_methods_category">Keyboard and input methods</string>
<string name="keyboard_and_input_methods_category">Keyboard &amp; inputs</string>
<!-- Title for the 'virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
<string name="virtual_keyboard_category">Virtual keyboards</string>
<!-- Title for the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
@@ -7536,7 +7536,7 @@
<string name="backup_disabled">Back up disabled</string>
<!-- Summary of device info page [CHAR LIMIT=NONE] -->
<string name="about_summary">Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
<string name="about_summary">Updated to Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
<!-- Title for dialog displayed when user clicks on a setting locked by an admin [CHAR LIMIT=30] -->
<string name="disabled_by_policy_title">Action not allowed</string>
@@ -8119,8 +8119,8 @@
<!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
<string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device.</string>
<!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=60]-->
<string name="fingerprint_swipe_for_notifications_title">Swipe for notifications</string>
<!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=80]-->
<string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
<!-- Summary text for fingerprint swipe for notifications (phone) [CHAR LIMIT=160]-->
<string name="fingerprint_swipe_for_notifications_summary" product="default">To check your notifications, swipe down on the fingerprint sensor on the back of your phone.</string>
@@ -8318,8 +8318,8 @@
<string name="webview_disabled_for_user">(disabled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>
<!-- AutoFill strings -->
<!-- Preference label for the auto-fill app. [CHAR LIMIT=60] -->
<string name="autofill_app">Autofill app</string>
<!-- Preference label for choosing auto-fill service. [CHAR LIMIT=60] -->
<string name="autofill_app">Autofill service</string>
<!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->
<string name="autofill_keywords">auto, fill, autofill</string>
<!-- Title of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->

3
res/xml/language_and_input.xml
View File

@@ -34,6 +34,8 @@
android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment"/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/input_assistance">
<!-- Spell checker preference title, summary and fragment will be set programmatically. -->
<!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.
See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->
@@ -47,6 +49,7 @@
<Preference
android:key="key_user_dictionary_settings"
android:title="@string/user_dict_settings_title"/>
</PreferenceCategory>
<PreferenceCategory
android:key="gesture_settings_category"

4
res/xml/system_dashboard_fragment.xml
View File

@@ -23,7 +23,7 @@
<Preference
android:key="system_update_settings"
android:title="@string/system_update_settings_list_item_title"
android:summary="@string/system_update_settings_list_item_summary"
android:summary="@string/summary_placeholder"
android:icon="@drawable/ic_system_update"
android:order="-30">
<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
@@ -41,7 +41,7 @@
<!-- Factory reset -->
<com.android.settingslib.RestrictedPreference
android:key="factory_reset"
android:title="@string/device_reset_title"
android:title="@string/master_clear_title"
android:icon="@drawable/ic_restore"
android:order="-20"
settings:keywords="@string/keywords_factory_data_reset"

30
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -20,14 +20,12 @@ import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
import com.android.settings.deviceinfo.BasebandVersionPreferenceController;
import com.android.settings.deviceinfo.BuildNumberPreferenceController;
@@ -88,34 +86,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
getLifecycle());
}
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
private final Context mContext;
private final SummaryLoader mSummaryLoader;
public SummaryProvider(Context context, SummaryLoader summaryLoader) {
mContext = context;
mSummaryLoader = summaryLoader;
}
@Override
public void setListening(boolean listening) {
if (listening) {
mSummaryLoader.setSummary(this, mContext.getString(R.string.about_summary,
Build.VERSION.RELEASE));
}
}
}
public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
= new SummaryLoader.SummaryProviderFactory() {
@Override
public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
SummaryLoader summaryLoader) {
return new SummaryProvider(activity, summaryLoader);
}
};
private static List<PreferenceController> buildPreferenceControllers(Context context,
Activity activity, Fragment fragment, Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();

3
src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.support.v7.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.applications.PackageManagerWrapper;
import com.android.settings.applications.PackageManagerWrapperImpl;
import com.android.settings.core.PreferenceController;
@@ -56,7 +57,7 @@ public abstract class DefaultAppPreferenceController extends PreferenceControlle
preference.setSummary(defaultAppLabel);
} else {
Log.d(TAG, "No default app");
preference.setSummary(null);
preference.setSummary(R.string.app_list_preference_none);
}
mayUpdateGearIcon(app, preference);
}

8
src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.deviceinfo;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.PersistableBundle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
@@ -25,6 +26,7 @@ import android.telephony.CarrierConfigManager;
import android.text.TextUtils;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
@@ -78,6 +80,12 @@ public class SystemUpdatePreferenceController extends PreferenceController {
return false;
}
@Override
public void updateState(Preference preference) {
preference.setSummary(mContext.getString(R.string.about_summary,
Build.VERSION.RELEASE));
}
/**
* Trigger client initiated action (send intent) on system update
*/

46
src/com/android/settings/language/LanguageAndInputSettings.java
View File

@@ -16,11 +16,17 @@
package com.android.settings.language;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.speech.tts.TtsEngines;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
@@ -28,14 +34,15 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.gestures.AssistGesturePreferenceController;
import com.android.settings.gestures.DoubleTapPowerPreferenceController;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.DoubleTwistPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
import com.android.settings.gestures.SwipeToNotificationPreferenceController;
import com.android.settings.inputmethod.GameControllerPreferenceController;
import com.android.settings.inputmethod.SpellCheckerPreferenceController;
import com.android.settings.gestures.SwipeToNotificationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import java.util.ArrayList;
@@ -104,6 +111,43 @@ public class LanguageAndInputSettings extends DashboardFragment {
mAmbientDisplayConfig = ambientConfig;
}
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
private final Context mContext;
private final SummaryLoader mSummaryLoader;
public SummaryProvider(Context context, SummaryLoader summaryLoader) {
mContext = context;
mSummaryLoader = summaryLoader;
}
@Override
public void setListening(boolean listening) {
if (listening) {
final String flattenComponent = Settings.Secure.getString(
mContext.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
if (!TextUtils.isEmpty(flattenComponent)) {
final PackageManager packageManage = mContext.getPackageManager();
final String pkg = ComponentName.unflattenFromString(flattenComponent)
.getPackageName();
final InputMethodManager imm = (InputMethodManager) mContext.getSystemService(
Context.INPUT_METHOD_SERVICE);
final List<InputMethodInfo> imis = imm.getInputMethodList();
for (InputMethodInfo imi : imis) {
if (TextUtils.equals(imi.getPackageName(), pkg)) {
mSummaryLoader.setSummary(this, imi.loadLabel(packageManage));
return;
}
}
}
mSummaryLoader.setSummary(this, "");
}
}
}
public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
= (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override

3
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
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 {

3
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
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

3
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
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

21
tests/robotests/src/com/android/settings/deviceinfo/SystemUpdatePreferenceControllerTest.java
View File

@@ -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);

40
tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
View File

@@ -16,8 +16,14 @@
package com.android.settings.language;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.input.InputManager;
import android.provider.Settings;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.textservice.TextServicesManager;
import com.android.internal.hardware.AmbientDisplayConfiguration;
@@ -27,6 +33,8 @@ import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
import org.junit.Test;
@@ -36,6 +44,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
@@ -51,6 +60,10 @@ public class LanguageAndInputSettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private PackageManager mPackageManager;
@Mock
private InputMethodManager mInputMethodManager;
private TestFragment mFragment;
@Before
@@ -87,6 +100,33 @@ public class LanguageAndInputSettingsTest {
assertThat(controllers.isEmpty()).isFalse();
}
@Test
@Config(shadows = {
ShadowSecureSettings.class,
})
public void testSummary_shouldSetToCurrentImeName() {
final Activity activity = mock(Activity.class);
final SummaryLoader loader = mock(SummaryLoader.class);
final ComponentName componentName = new ComponentName("pkg", "cls");
ShadowSecureSettings.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD,
componentName.flattenToString());
when(activity.getSystemService(Context.INPUT_METHOD_SERVICE))
.thenReturn(mInputMethodManager);
when(activity.getPackageManager()).thenReturn(mPackageManager);
final List<InputMethodInfo> imis = new ArrayList<>();
imis.add(mock(InputMethodInfo.class));
when(imis.get(0).getPackageName()).thenReturn(componentName.getPackageName());
when(mInputMethodManager.getInputMethodList()).thenReturn(imis);
SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
.createSummaryProvider(activity, loader);
provider.setListening(true);
verify(imis.get(0)).loadLabel(mPackageManager);
verify(loader).setSummary(provider, null);
}
/**
* Test fragment to expose lifecycle and context so we can verify behavior for observables.
*/