Merge commit '36a1bbe8' into HEAD

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment" />

                android:value="com.android.settings.accessibility.CaptionPropertiesFragment" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/accessibility_settings" />

        </activity>

        <!-- Development settings -->

        <activity android:name="DebugIntentSender" android:label="@string/debug_intent_sender_label">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />

            </intent-filter>

        </activity>

        <!-- DeviceInfo adds the user's requested build to stats upload.  -->

        <receiver android:name=".DeviceInfo$StatsReportReceiver">

            <intent-filter>

            android:text="@string/captioning_preview_text" />

    </FrameLayout>

    <fragment

    <FrameLayout

        android:id="@+id/properties_fragment"

        android:name="com.android.settings.accessibility.CaptionPropertiesFragment"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->

    <string name="bluetooth_advanced_titlebar">Advanced Bluetooth</string>

    <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->

    <string name="bluetooth_empty_list_bluetooth_off">To see devices, turn Bluetooth on.</string>

    <string name="bluetooth_empty_list_bluetooth_off">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.</string>

    <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->

    <!-- SMS Application [CHAR LIMIT=35]-->

    <string name="sms_application_title" translatable="true">Default SMS app</string>

    <string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>

    <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> instead of <xliff:g id="current_app">%s</xliff:g> as your SMS app?</string>

    <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%1$s</xliff:g> instead of <xliff:g id="current_app">%2$s</xliff:g> as your SMS app?</string>

    <string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>

    <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->

    <string name="captioning_background_opacity">Background opacity</string>

    <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->

    <string name="captioning_foreground_color">Text color</string>

    <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->

    <string name="captioning_foreground_opacity">Text opacity</string>

    <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->

    <string name="captioning_edge_color">Edge color</string>

    <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->

    <string name="help_url_security" translatable="false"></string>

    <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->

    <string name="help_url_nfc_payment" translatable="false"></string>

    <!-- Help URL, Remote display [DO NOT TRANSLATE] -->

    <string name="help_url_remote_display" translatable="false"></string>

    <!-- User account title [CHAR LIMIT=30] -->

    <string name="user_account_title">Account for content</string>

            android:title="@string/accessibility_system_title">

        <PreferenceScreen

            android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment"

            android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"

            android:key="captioning_preference_screen"

            android:title="@string/accessibility_captioning_title" />

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment"

    android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"

    android:key="captioning_preference_screen"

    android:title="@string/accessibility_captioning_title" >

            android:key="captioning_foreground_color"

            android:persistent="false"

            android:title="@string/captioning_foreground_color" />

        <com.android.settings.accessibility.ColorPreference

            android:key="captioning_foreground_opacity"

            android:persistent="false"

            android:title="@string/captioning_foreground_opacity" />

        <com.android.settings.accessibility.EdgeTypePreference

            android:key="captioning_edge_type"