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

Commit a270ac4a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove unnecessary DebugSettingsActivity, use fragment directly 

This CL must be checked in together with I1db2e848ab.

Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
parent 3f513f10

java/AndroidManifest.xml

+0 −8
Original line number Diff line number Diff line
@@ -102,14 +102,6 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".settings.DebugSettingsActivity"

                android:theme="@style/platformSettingsTheme"

                android:label="@string/english_ime_debug_settings">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <receiver android:name="SuggestionSpanPickedNotificationReceiver" android:enabled="true">

            <intent-filter>

                <action android:name="android.text.style.SUGGESTION_PICKED" />

java/res/xml/prefs.xml

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ 
            android:defaultValue="true"

            android:persistent="true" />

        <PreferenceScreen

            android:fragment="com.android.inputmethod.latin.settings.DebugSettings"

            android:key="screen_debug"

            android:title="Debug settings"

            android:defaultValue="false"

java/src/com/android/inputmethod/latin/settings/DebugSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public final class DebugSettings extends PreferenceFragment 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        addPreferencesFromResource(R.xml.prefs_for_debug);

        addPreferencesFromResource(R.xml.prefs_screen_debug);

        TwoStatePreferenceHelper.replaceCheckBoxPreferencesBySwitchPreferences(

                getPreferenceScreen());

        SharedPreferences prefs = getPreferenceManager().getSharedPreferences();

java/src/com/android/inputmethod/latin/settings/DebugSettingsActivity.java

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.inputmethod.latin.settings;



import android.content.Intent;

import android.os.Bundle;

import android.preference.PreferenceActivity;



import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.utils.FragmentUtils;



public final class DebugSettingsActivity extends PreferenceActivity {

    private static final String DEFAULT_FRAGMENT = DebugSettings.class.getName();



    @Override

    public Intent getIntent() {

        final Intent intent = super.getIntent();

        intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);

        intent.putExtra(EXTRA_NO_HEADERS, true);

        return intent;

    }



    @Override

    protected void onCreate(final Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setTitle(R.string.english_ime_debug_settings);

    }



    // TODO: Uncomment the override annotation once we start using SDK version 19.

    // @Override

    public boolean isValidFragment(String fragmentName) {

        return FragmentUtils.isValidFragment(fragmentName);

    }

}