diff options
| author | Alan Viverette <alanv@google.com> | 2013-09-12 11:26:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 11:26:22 -0700 |
| commit | 6489d6f6547f5eb96d9a675ba68fa241ab699b42 (patch) | |
| tree | 802928f60284cc7132d34f8114b1b5bbe4fdb037 | |
| parent | 32aa0bfdd5984970e22da9676c5f59cc0bf9203e (diff) | |
| parent | 54fa990f6174542e1e7fbe77a75954fcd2f39983 (diff) | |
| download | packages_apps_Settings-6489d6f6547f5eb96d9a675ba68fa241ab699b42.zip packages_apps_Settings-6489d6f6547f5eb96d9a675ba68fa241ab699b42.tar.gz packages_apps_Settings-6489d6f6547f5eb96d9a675ba68fa241ab699b42.tar.bz2 | |
am 54fa990f: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
* commit '54fa990f6174542e1e7fbe77a75954fcd2f39983':
Fix manifest entry for CAPTIONING_SETTINGS action
| -rw-r--r-- | src/com/android/settings/Settings.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 62d4aa8..e754f98 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -54,6 +54,7 @@ import android.widget.TextView; import com.android.internal.util.ArrayUtils; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment; +import com.android.settings.accessibility.ToggleCaptioningPreferenceFragment; import com.android.settings.accounts.AccountSyncSettings; import com.android.settings.accounts.AuthenticatorHelper; import com.android.settings.accounts.ManageAccountsSettings; @@ -317,6 +318,7 @@ public class Settings extends PreferenceActivity PrivacySettings.class.getName(), DeviceAdminSettings.class.getName(), AccessibilitySettings.class.getName(), + ToggleCaptioningPreferenceFragment.class.getName(), TextToSpeechSettings.class.getName(), Memory.class.getName(), DevelopmentSettings.class.getName(), @@ -940,6 +942,7 @@ public class Settings extends PreferenceActivity public static class StorageUseActivity extends Settings { /* empty */ } public static class DevelopmentSettingsActivity extends Settings { /* empty */ } public static class AccessibilitySettingsActivity extends Settings { /* empty */ } + public static class CaptioningSettingsActivity extends Settings { /* empty */ } public static class SecuritySettingsActivity extends Settings { /* empty */ } public static class LocationSettingsActivity extends Settings { /* empty */ } public static class PrivacySettingsActivity extends Settings { /* empty */ } |