[tor-commits] [orbot/master] no need to override methods with nothing

commit 237366cd277d3cf52eeb0f0788275de89b37e054 Author: Hans-Christoph Steiner hans@eds.org Date: Fri Jun 5 15:14:40 2015 -0400

no need to override methods with nothing --- .../android/settings/SettingsPreferences.java | 28 -------------------- .../ui/wizard/ChooseLocaleWizardActivity.java | 23 +--------------- 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index 339514a..5a96c9b 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -55,14 +55,6 @@ public class SettingsPreferences init(); } - - @Override - protected void onResume() { - - super.onResume(); - - } - private void init () { int SET_LOCALE_IDX = 3; @@ -113,31 +105,11 @@ public class SettingsPreferences }; - - - - @Override - protected void onPause() {

- super.onPause(); -

- - - - - }

- /* (non-Javadoc) - * @see android.app.Activity#onStop() - */ - @Override - protected void onStop() { - super.onStop(); - - }

public boolean onPreferenceClick(Preference preference) { diff --git a/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java index 2c5470c..79faa83 100644 --- a/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java @@ -29,13 +29,7 @@ public class ChooseLocaleWizardActivity extends Activity implements OrbotConstan protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - } - - @Override - protected void onStart() { - - super.onStart(); + setContentView(R.layout.layout_wizard_locale);

@@ -106,21 +100,6 @@ public class ChooseLocaleWizardActivity extends Activity implements OrbotConstan Locale.setDefault(locale); config.locale = locale; getResources().updateConfiguration(config, getResources().getDisplayMetrics()); - - - - - } - - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - }

//Code to override the back button!