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

Combine Language & region and Input & gestures in System settings.

Browse Source 
Merge preferences into one page, and update test.

Bug: 34976047
Test: make RunSettingsRoboTests
Change-Id: I5f15192e42f6054c02d4c8ffa9f25db3075da409
This commit is contained in:
Doris Ling
2017-02-03 16:16:42 -08:00
parent 845d1503d0
commit 34cfd2e24f
12 changed files with 81 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -88,13 +88,12 @@ import com.android.settings.gestures.GestureSettings;
import com.android.settings.gestures.PickupGestureSettings;
import com.android.settings.gestures.SwipeToNotificationSettings;
import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
import com.android.settings.inputmethod.InputAndGestureSettings;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
import com.android.settings.inputmethod.PhysicalKeyboardFragment;
import com.android.settings.inputmethod.SpellCheckersSettings;
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.language.LanguageAndRegionSettings;
import com.android.settings.language.LanguageAndInputSettings;
import com.android.settings.localepicker.LocaleListEditor;
import com.android.settings.location.LocationSettings;
import com.android.settings.network.NetworkDashboardFragment;
@@ -149,8 +148,7 @@ public class SettingsGateway {
LocaleListEditor.class.getName(),
InputMethodAndLanguageSettings.class.getName(),
AvailableVirtualKeyboardFragment.class.getName(),
InputAndGestureSettings.class.getName(),
LanguageAndRegionSettings.class.getName(),
LanguageAndInputSettings.class.getName(),
SpellCheckersSettings.class.getName(),
UserDictionaryList.class.getName(),
UserDictionarySettings.class.getName(),
@@ -299,8 +297,7 @@ public class SettingsGateway {
// Home page > Security
"com.android.settings.LocationDashboardAlias",
// Home page > System
Settings.LanguageAndRegionSettingsActivity.class.getName(),
Settings.InputAndGestureSettingsActivity.class.getName(),
Settings.LanguageAndInputSettingsActivity.class.getName(),
"com.android.settings.DateTimeDashboardAlias",
"com.android.settings.AccessibilityDashboardAlias",
"com.android.settings.AboutDeviceDashboardAlias",