Move autofill app picker from advanced app to language page
Change-Id: I38979e17e51bda92179ca5b7ba4293677aa18a96 Fix: 36130404 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -61,13 +61,6 @@
|
|||||||
settings:keywords="@string/keywords_emergency_app"
|
settings:keywords="@string/keywords_emergency_app"
|
||||||
android:order="-15"/>
|
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
|
<Preference
|
||||||
android:key="default_notification_asst_app"
|
android:key="default_notification_asst_app"
|
||||||
|
@@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
<PreferenceScreen
|
<PreferenceScreen
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
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" >
|
android:title="@string/language_keyboard_settings_title" >
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
@@ -45,6 +46,12 @@
|
|||||||
android:persistent="false"
|
android:persistent="false"
|
||||||
android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"/>
|
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. -->
|
<!-- User dictionary preference title and fragment will be set programmatically. -->
|
||||||
<Preference
|
<Preference
|
||||||
android:key="key_user_dictionary_settings"
|
android:key="key_user_dictionary_settings"
|
||||||
|
@@ -20,7 +20,6 @@ import android.provider.SearchIndexableResource;
|
|||||||
|
|
||||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||||
import com.android.settings.R;
|
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.DefaultBrowserPreferenceController;
|
||||||
import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
|
import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
|
||||||
import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
|
import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
|
||||||
@@ -61,7 +60,6 @@ public class AdvancedAppSettings extends DashboardFragment {
|
|||||||
controllers.add(new DefaultSmsPreferenceController(context));
|
controllers.add(new DefaultSmsPreferenceController(context));
|
||||||
controllers.add(new DefaultEmergencyPreferenceController(context));
|
controllers.add(new DefaultEmergencyPreferenceController(context));
|
||||||
controllers.add(new DefaultHomePreferenceController(context));
|
controllers.add(new DefaultHomePreferenceController(context));
|
||||||
controllers.add(new DefaultAutofillPreferenceController(context));
|
|
||||||
return controllers;
|
return controllers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -31,6 +31,7 @@ import android.view.inputmethod.InputMethodManager;
|
|||||||
import com.android.internal.hardware.AmbientDisplayConfiguration;
|
import com.android.internal.hardware.AmbientDisplayConfiguration;
|
||||||
import com.android.internal.logging.nano.MetricsProto;
|
import com.android.internal.logging.nano.MetricsProto;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
|
||||||
import com.android.settings.core.PreferenceController;
|
import com.android.settings.core.PreferenceController;
|
||||||
import com.android.settings.core.lifecycle.Lifecycle;
|
import com.android.settings.core.lifecycle.Lifecycle;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
@@ -103,6 +104,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
|
|||||||
context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
|
context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
|
||||||
controllers.add(new DoubleTapScreenPreferenceController(
|
controllers.add(new DoubleTapScreenPreferenceController(
|
||||||
context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
|
context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
|
||||||
|
controllers.add(new DefaultAutofillPreferenceController(context));
|
||||||
return controllers;
|
return controllers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -21,6 +21,7 @@ import android.content.ComponentName;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.hardware.input.InputManager;
|
import android.hardware.input.InputManager;
|
||||||
|
import android.os.UserManager;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.view.inputmethod.InputMethodInfo;
|
import android.view.inputmethod.InputMethodInfo;
|
||||||
import android.view.inputmethod.InputMethodManager;
|
import android.view.inputmethod.InputMethodManager;
|
||||||
@@ -69,6 +70,7 @@ public class LanguageAndInputSettingsTest {
|
|||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
MockitoAnnotations.initMocks(this);
|
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.INPUT_SERVICE)).thenReturn(mock(InputManager.class));
|
||||||
when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
|
when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
|
||||||
.thenReturn(mock(TextServicesManager.class));
|
.thenReturn(mock(TextServicesManager.class));
|
||||||
|
Reference in New Issue
Block a user