diff options
| -rw-r--r-- | AndroidManifest.xml | 13 | ||||
| -rw-r--r-- | res/values/strings.xml | 15 | ||||
| -rw-r--r-- | res/xml/settings_headers.xml | 4 |
3 files changed, 9 insertions, 23 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4118f32..2b0902e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -356,7 +356,6 @@ <action android:name="android.settings.INPUT_METHOD_SETTINGS" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.DEFAULT" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" /> @@ -372,7 +371,6 @@ <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.DEFAULT" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.inputmethod.SpellCheckersSettings" /> @@ -392,7 +390,6 @@ <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.DEFAULT" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> </activity> @@ -412,7 +409,6 @@ <action android:name="com.android.settings.USER_DICTIONARY_INSERT" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.UserDictionarySettings" /> @@ -467,7 +463,6 @@ <action android:name="com.android.settings.DOCK_SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.DockSettings" /> @@ -510,7 +505,7 @@ </activity> <activity android:name="Settings$ManageApplicationsActivity" - android:label="@string/manageapplications_settings_title" + android:label="@string/applications_settings" android:clearTaskOnLaunch="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -561,7 +556,6 @@ <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.MONKEY" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.applications.ManageApplications" /> @@ -578,7 +572,6 @@ <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" /> <category android:name="android.intent.category.MONKEY" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.applications.ManageApplications" /> @@ -614,7 +607,6 @@ <action android:name="android.credentials.UNLOCK" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.SecuritySettings" /> @@ -662,7 +654,6 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> - <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.DeviceAdminSettings" /> @@ -696,7 +687,7 @@ </activity> <activity android:name="Settings$AccessibilitySettingsActivity" - android:label="@string/accessibility_settings_title" + android:label="@string/accessibility_settings" android:configChanges="orientation|keyboardHidden|screenSize" android:clearTaskOnLaunch="true"> <intent-filter> diff --git a/res/values/strings.xml b/res/values/strings.xml index 407d159..03afded 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -539,7 +539,7 @@ <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] --> <string name="settings_label_launcher">Settings</string> <!-- Label for option to select a settings panel as a shortcut --> - <string name="settings_shortcut">Select settings shortcut</string> + <string name="settings_shortcut">Settings shortcut</string> <!-- Wireless controls settings screen, setting check box label --> <string name="airplane_mode">Airplane mode</string> <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN. This will take you to another screen with those settings. --> @@ -1392,12 +1392,9 @@ <string name="config_list_label" translatable="false">Configured Networks</string> <!-- Sound and alerts settings --> - <!-- Main Settings screen setting option name to go into the sound settings screen --> - <string name="sound_settings_title">Sound</string> - <!-- Main Settings screen setting option name to go into the display settings screen --> - <string name="display_settings_title">Display</string> + <skip/> <!-- Sound settings screen heading --> - <string name="sound_settings">Sound settings</string> + <string name="sound_settings">Sound</string> <!-- Sound settings screen, setting option name checkbox --> <string name="silent_mode_title">Silent mode</string> <!-- Sound settings screen, setting option summary text when going into silent mode. Media and alarms sounds WILL NOT be silenced in silent mode. --> @@ -1521,9 +1518,9 @@ <!-- Main Settings screen, setting option summary to go into search settings --> <string name="search_settings_summary">Manage search settings and history</string> - <!-- Display settings --> + <!-- Display settings --><skip/> <!-- Sound & display settings screen, section header for settings related to display --> - <string name="display_settings">Screen settings</string> + <string name="display_settings">Display</string> <!-- Sound & display settings screen, accelerometer-based rotation check box label --> <string name="accelerometer_title">Auto-rotate screen</string> <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected --> @@ -2662,8 +2659,6 @@ found in the list of installed applications.</string> <!-- Settings title in main settings screen for accessibility settings --> <string name="accessibility_settings">Accessibility</string> - <!-- Settings title for accessibility settings screen --> - <string name="accessibility_settings_title">Accessibility settings</string> <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] --> <string name="accessibility_services_title">Services</string> diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index cd6191f..40e1880 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -66,14 +66,14 @@ android:id="@+id/sound_settings" android:icon="@drawable/ic_settings_sound" android:fragment="com.android.settings.SoundSettings" - android:title="@string/sound_settings_title" /> + android:title="@string/sound_settings" /> <!-- Display --> <header android:id="@+id/display_settings" android:icon="@drawable/ic_settings_display" android:fragment="com.android.settings.DisplaySettings" - android:title="@string/display_settings_title" /> + android:title="@string/display_settings" /> <!-- Storage --> <header |