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

Move autofill app picker from advanced app to language page

Browse Source 
Change-Id: I38979e17e51bda92179ca5b7ba4293677aa18a96
Fix: 36130404
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-03-21 17:26:59 -07:00
parent 3720e0c4f1
commit 3a32ee6132
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/app_default_settings.xml
View File

@@ -61,13 +61,6 @@
settings:keywords="@string/keywords_emergency_app"
android:order="-15"/>
<com.android.settings.widget.GearPreference
android:key="default_autofill"
android:title="@string/autofill_app"
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
settings:keywords="@string/autofill_keywords"
android:order="-14"/>
<!--
<Preference
android:key="default_notification_asst_app"

7
res/xml/language_and_input.xml
View File

@@ -17,6 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/language_keyboard_settings_title" >
<Preference
@@ -45,6 +46,12 @@
android:persistent="false"
android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"/>
<com.android.settings.widget.GearPreference
android:key="default_autofill"
android:title="@string/autofill_app"
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
settings:keywords="@string/autofill_keywords" />
<!-- User dictionary preference title and fragment will be set programmatically. -->
<Preference
android:key="key_user_dictionary_settings"

2
src/com/android/settings/applications/AdvancedAppSettings.java
View File

@@ -20,7 +20,6 @@ import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
@@ -61,7 +60,6 @@ public class AdvancedAppSettings extends DashboardFragment {
controllers.add(new DefaultSmsPreferenceController(context));
controllers.add(new DefaultEmergencyPreferenceController(context));
controllers.add(new DefaultHomePreferenceController(context));
controllers.add(new DefaultAutofillPreferenceController(context));
return controllers;
}

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

@@ -31,6 +31,7 @@ import android.view.inputmethod.InputMethodManager;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
@@ -103,6 +104,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
controllers.add(new DoubleTapScreenPreferenceController(
context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
controllers.add(new DefaultAutofillPreferenceController(context));
return controllers;
}

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

@@ -21,6 +21,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.input.InputManager;
import android.os.UserManager;
import android.provider.Settings;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
@@ -69,6 +70,7 @@ public class LanguageAndInputSettingsTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mock(InputManager.class));
when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
.thenReturn(mock(TextServicesManager.class));