From 8e33646304c34a926a7e8df0ed18c5fc0bc40a3d Mon Sep 17 00:00:00 2001 From: Artur Dryomov Date: Fri, 6 Sep 2013 20:19:47 +0300 Subject: Fix minor code style issues. Change-Id: I316529388e1e90acd5b62441cf304a61ac71931a --- .../impressremote/activity/ComputerCreationActivity.java | 14 ++++++++++---- .../impressremote/activity/ComputersActivity.java | 13 ++++++++----- .../impressremote/activity/LicensesActivity.java | 4 ++-- .../impressremote/activity/RequirementsActivity.java | 4 ++-- .../impressremote/activity/SettingsActivity.java | 4 ++-- .../impressremote/fragment/ComputersFragment.java | 8 ++++---- .../org/libreoffice/impressremote/util/Preferences.java | 1 + 7 files changed, 29 insertions(+), 19 deletions(-) (limited to 'android') diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java index 822d6e17e0e7..4e91251ef498 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java @@ -55,7 +55,8 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement } private ActionBar.LayoutParams buildCustomActionBarLayoutParams() { - return new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + return new ActionBar.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); } @@ -128,9 +129,14 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement } @Override - public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) { - if (actionId == EditorInfo.IME_ACTION_DONE) { - saveServer(); + public boolean onEditorAction(TextView aTextView, int aActionId, KeyEvent aKeyEvent) { + switch (aActionId) { + case EditorInfo.IME_ACTION_DONE: + saveServer(); + break; + + default: + break; } return false; diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java index bb82024ce5a8..954c9fc4ecf8 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java @@ -37,15 +37,15 @@ public class ComputersActivity extends SherlockFragmentActivity implements Actio } @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected void onCreate(Bundle aSavedInstanceState) { + super.onCreate(aSavedInstanceState); setUpTitle(); setUpContent(); } private void setUpTitle() { - // Looks hacky but it seems to be the best way to set activity title + // Looks hacky but it seems to be the best way to set activity’s title // different to application’s label. The other way is setting title // to intents filter but it shows wrong label for recent apps screen. @@ -145,7 +145,9 @@ public class ComputersActivity extends SherlockFragmentActivity implements Actio } private int loadTabIndex() { - return Preferences.getApplicationStatesInstance(this).getInt(Preferences.Keys.SELECTED_COMPUTERS_TAB_INDEX); + Preferences aPreferences = Preferences.getApplicationStatesInstance(this); + + return aPreferences.getInt(Preferences.Keys.SELECTED_COMPUTERS_TAB_INDEX); } private void setUpComputersList() { @@ -227,9 +229,10 @@ public class ComputersActivity extends SherlockFragmentActivity implements Actio } private void saveTabIndex() { + Preferences aPreferences = Preferences.getApplicationStatesInstance(this); int aTabIndex = getSupportActionBar().getSelectedNavigationIndex(); - Preferences.getApplicationStatesInstance(this).setInt(Preferences.Keys.SELECTED_COMPUTERS_TAB_INDEX, aTabIndex); + aPreferences.setInt(Preferences.Keys.SELECTED_COMPUTERS_TAB_INDEX, aTabIndex); } } diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java index 8d3dc634a80b..0d11c5035272 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java @@ -22,8 +22,8 @@ public class LicensesActivity extends SherlockActivity { private static final String PATH = "licenses.html"; @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected void onCreate(Bundle aSavedInstanceState) { + super.onCreate(aSavedInstanceState); setContentView(R.layout.activity_licenses); setUpHomeButton(); diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/RequirementsActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/RequirementsActivity.java index b99023d558a4..0429b6e65df5 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/activity/RequirementsActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/RequirementsActivity.java @@ -16,8 +16,8 @@ import org.libreoffice.impressremote.R; public class RequirementsActivity extends SherlockActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected void onCreate(Bundle aSavedInstanceState) { + super.onCreate(aSavedInstanceState); setContentView(R.layout.activity_requirements); setUpHomeButton(); diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java index 612b6c748951..ea1a9a5bc208 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java @@ -16,8 +16,8 @@ import org.libreoffice.impressremote.R; public class SettingsActivity extends SherlockPreferenceActivity { @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected void onCreate(Bundle aSavedInstanceState) { + super.onCreate(aSavedInstanceState); setUpHomeButton(); setUpPreferences(); diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java index bc71865c81b0..410079ee9ff6 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java @@ -76,8 +76,8 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo } @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + public void onCreate(Bundle aSavedInstanceState) { + super.onCreate(aSavedInstanceState); mType = (Type) getArguments().getSerializable("TYPE"); @@ -89,8 +89,8 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo } @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); + public void onActivityCreated(Bundle aSavedInstanceState) { + super.onActivityCreated(aSavedInstanceState); bindService(); } diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java index 4ad2490f8712..d63fdd41ed0a 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java +++ b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java @@ -29,6 +29,7 @@ public final class Preferences { } public static final String SELECTED_COMPUTERS_TAB_INDEX = "selected_computers_tab_index"; + public static final String VOLUME_KEYS_ACTIONS = "volume_keys_actions"; public static final String KEEP_SCREEN_ON = "keep_screen_on"; } -- cgit