Add Input & Gesture/Language & Region pages under System.

- Removed LanguageAndInputDashboardAlias because now the contents are
  moved to new pages.

Bug: 32637613
Bug: 32643833
Test: RunSettingsRoboTests
Change-Id: Ia66a942a449a07b9cbba53bdc97738148aafadb4
This commit is contained in:
Fan Zhang
2016-11-07 15:12:52 -08:00
parent 22d42d52cf
commit a1d1d67ce3
12 changed files with 459 additions and 7 deletions

View File

@@ -3190,18 +3190,35 @@
</activity>
<!-- Alias for IME & Language in new IA. Should merge into TargetActivity when launch -->
<activity-alias android:name="LanguageAndInputDashboardAlias"
android:targetActivity="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter android:priority="250">
<activity android:name=".Settings$LanguageAndRegionSettingsActivity"
android:label="@string/language_and_region_settings_title"
android:icon="@drawable/ic_settings_language">
<intent-filter android:priority="260">
<action android:name="com.android.settings.action.SETTINGS"/>
</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.FRAGMENT_CLASS"
android:value="com.android.settings.language.LanguageAndRegionSettings"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true"/>
<!-- Inherit intent-filter from LanguageSettingsActivity -->
</activity>
<activity android:name=".Settings$InputAndGestureSettingsActivity"
android:label="@string/input_gesture_settings_title"
android:icon="@drawable/ic_settings_language">
<intent-filter android:priority="255">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.inputmethod.InputAndGestureSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity-alias>
<!-- Inherit intent-filter from LanguageSettingsActivity -->
</activity>
<!-- Alias for Date & Time in new IA. Should merge into TargetActivity when launch -->
<activity-alias android:name="DateTimeDashboardAlias"