Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af28facb authored by Alan Viverette's avatar Alan Viverette
Browse files

DO NOT MERGE Remove extra fragment in captioning preferences 

BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
parent d83484db

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ 
                <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>

res/layout/captioning_preview.xml

+1 −2
Original line number Diff line number Diff line
@@ -40,9 +40,8 @@ 
            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" />

res/xml/accessibility_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
            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" />

res/xml/captioning_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<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" >

src/com/android/settings/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ import android.widget.TextView; 


import com.android.internal.util.ArrayUtils;

import com.android.settings.accessibility.AccessibilitySettings;

import com.android.settings.accessibility.CaptionPropertiesFragment;

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;
@@ -331,7 +331,7 @@ public class Settings extends PreferenceActivity 
        PrivacySettings.class.getName(),

        DeviceAdminSettings.class.getName(),

        AccessibilitySettings.class.getName(),

        ToggleCaptioningPreferenceFragment.class.getName(),

        CaptionPropertiesFragment.class.getName(),

        TextToSpeechSettings.class.getName(),

        Memory.class.getName(),

        DevelopmentSettings.class.getName(),