nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directly 

* commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7':
  Remove unnecessary DebugSettingsActivity, use fragment directly
main
Tadashi G. Takaoka 2014-07-24 20:01:00 +00:00 committed by Android Git Automerger
parent 129f05867f a270ac4a61
commit 456cc99678
6 changed files with 3 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/AndroidManifest.xml
View File

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

1
java/res/xml/prefs.xml
View File

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

0
java/res/xml/prefs_for_debug.xml → java/res/xml/prefs_screen_debug.xml
View File

2
java/src/com/android/inputmethod/latin/settings/DebugSettings.java
View File

@ -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();

48
java/src/com/android/inputmethod/latin/settings/DebugSettingsActivity.java
View File

@ -1,48 +0,0 @@
/*
* 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);
}
}

7
java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
View File

@ -136,12 +136,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
final PreferenceScreen debugScreen =
(PreferenceScreen) findPreference(Settings.SCREEN_DEBUG);
if (Settings.isInternal(prefs)) {
final Intent debugSettingsIntent = new Intent(Intent.ACTION_MAIN);
debugSettingsIntent.setClassName(
context.getPackageName(), DebugSettingsActivity.class.getName());
debugScreen.setIntent(debugSettingsIntent);
} else {
if (!Settings.isInternal(prefs)) {
advancedScreen.removePreference(debugScreen);
}