am 83994ad6: Merge "Fix the security related API change for PreferenceActivity" (7b470340) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/dictionarypack/DictionarySettingsActivity.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.inputmethod.dictionarypack;

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

		import android.content.Intent;
		import android.os.Bundle;
		import android.preference.PreferenceActivity;
		@@ -45,6 +47,6 @@ public final class DictionarySettingsActivity extends PreferenceActivity {
		// TODO: Uncomment the override annotation once we start using SDK version 19.
		// @Override
		public boolean isValidFragment(String fragmentName) {
		return fragmentName.equals(DEFAULT_FRAGMENT);
		return FragmentUtils.isValidFragment(fragmentName);
		}
		}

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 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.about;

		import android.app.Fragment;

		/**
		* Dummy class of AboutPreferences. Never use this.
		*/
		public final class AboutPreferences extends Fragment {
		private AboutPreferences() {
		// Prevents this from being instantiated
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ 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();
		@@ -42,6 +43,6 @@ public final class DebugSettingsActivity extends PreferenceActivity {
		// TODO: Uncomment the override annotation once we start using SDK version 19.
		// @Override
		public boolean isValidFragment(String fragmentName) {
		return fragmentName.equals(DEFAULT_FRAGMENT);
		return FragmentUtils.isValidFragment(fragmentName);
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.inputmethod.latin.settings;

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

		import android.content.Intent;
		import android.preference.PreferenceActivity;

		@@ -36,6 +38,6 @@ public final class SettingsActivity extends PreferenceActivity {
		// TODO: Uncomment the override annotation once we start using SDK version 19.
		// @Override
		public boolean isValidFragment(String fragmentName) {
		return fragmentName.equals(DEFAULT_FRAGMENT);
		return FragmentUtils.isValidFragment(fragmentName);
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.inputmethod.latin.spellcheck;

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

		import android.content.Intent;
		import android.os.Bundle;
		import android.preference.PreferenceActivity;
		@@ -42,6 +44,6 @@ public final class SpellCheckerSettingsActivity extends PreferenceActivity {
		// TODO: Uncomment the override annotation once we start using SDK version 19.
		// @Override
		public boolean isValidFragment(String fragmentName) {
		return fragmentName.equals(DEFAULT_FRAGMENT);
		return FragmentUtils.isValidFragment(fragmentName);
		}
		}