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

am 96fdbaa3: am 85eba056: am c5182c9a: Correspond to the security related API change for PreferenceActivity 

* commit '96fdbaa367b0bd7d052df48cb7a3197c1a37ac8e':
  Correspond to the security related API change for PreferenceActivity
main
Satoshi Kataoka 2013-10-09 19:32:48 -07:00 committed by Android Git Automerger
parent 6877060b7b 96fdbaa367
commit 03c5029cdb
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/dictionarypack/DictionarySettingsActivity.java
View File

@ -24,6 +24,8 @@ import android.preference.PreferenceActivity;
* Preference screen. * Preference screen.
*/ */
public final class DictionarySettingsActivity extends PreferenceActivity { public final class DictionarySettingsActivity extends PreferenceActivity {
private static final String DEFAULT_FRAGMENT = DictionarySettingsFragment.class.getName();
@Override @Override
protected void onCreate(final Bundle savedInstanceState) { protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -32,11 +34,17 @@ public final class DictionarySettingsActivity extends PreferenceActivity {
@Override @Override
public Intent getIntent() { public Intent getIntent() {
final Intent modIntent = new Intent(super.getIntent()); final Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, DictionarySettingsFragment.class.getName()); modIntent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
modIntent.putExtra(EXTRA_NO_HEADERS, true); modIntent.putExtra(EXTRA_NO_HEADERS, true);
// Important note : the original intent should contain a String extra with the key // Important note : the original intent should contain a String extra with the key
// DictionarySettingsFragment.DICT_SETTINGS_FRAGMENT_CLIENT_ID_ARGUMENT so that the // DictionarySettingsFragment.DICT_SETTINGS_FRAGMENT_CLIENT_ID_ARGUMENT so that the
// fragment can know who the client is. // fragment can know who the client is.
return modIntent; return modIntent;
} }
// TODO: Uncomment the override annotation once we start using SDK version 19.
// @Override
public boolean isValidFragment(String fragmentName) {
return fragmentName.equals(DEFAULT_FRAGMENT);
}
} }

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

@ -38,4 +38,10 @@ public final class DebugSettingsActivity extends PreferenceActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setTitle(R.string.english_ime_debug_settings); 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 fragmentName.equals(DEFAULT_FRAGMENT);
}
} }

6
java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
View File

@ -32,4 +32,10 @@ public final class SettingsActivity extends PreferenceActivity {
intent.putExtra(EXTRA_NO_HEADERS, true); intent.putExtra(EXTRA_NO_HEADERS, true);
return intent; return intent;
} }
// TODO: Uncomment the override annotation once we start using SDK version 19.
// @Override
public boolean isValidFragment(String fragmentName) {
return fragmentName.equals(DEFAULT_FRAGMENT);
}
} }

10
java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java
View File

@ -24,6 +24,8 @@ import android.preference.PreferenceActivity;
* Spell checker preference screen. * Spell checker preference screen.
*/ */
public final class SpellCheckerSettingsActivity extends PreferenceActivity { public final class SpellCheckerSettingsActivity extends PreferenceActivity {
private static final String DEFAULT_FRAGMENT = SpellCheckerSettingsFragment.class.getName();
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -32,8 +34,14 @@ public final class SpellCheckerSettingsActivity extends PreferenceActivity {
@Override @Override
public Intent getIntent() { public Intent getIntent() {
final Intent modIntent = new Intent(super.getIntent()); final Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, SpellCheckerSettingsFragment.class.getName()); modIntent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
modIntent.putExtra(EXTRA_NO_HEADERS, true); modIntent.putExtra(EXTRA_NO_HEADERS, true);
return modIntent; return modIntent;
} }
// TODO: Uncomment the override annotation once we start using SDK version 19.
// @Override
public boolean isValidFragment(String fragmentName) {
return fragmentName.equals(DEFAULT_FRAGMENT);
}
} }