Fix minor code style issues.

Change-Id: I1cc46176efcdc0a869ba711054137e56662d7ab3

8 files changed, 26 insertions, 20 deletions

diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
index 7a5281da08f4..fda1d96d232f 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java
@@ -20,8 +20,8 @@ import org.libreoffice.impressremote.communication.Server;
 
 public class ComputerConnectionActivity extends SherlockFragmentActivity {
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    protected void onCreate(Bundle aSavedInstanceState) {
+        super.onCreate(aSavedInstanceState);
 
         setUpHomeButton();
         setUpTitle();
diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
index d229c58c34a7..a29d817cd405 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -36,6 +36,7 @@ import org.libreoffice.impressremote.fragment.TimerSettingDialog;
 import org.libreoffice.impressremote.util.FragmentOperator;
 import org.libreoffice.impressremote.util.Intents;
 import org.libreoffice.impressremote.util.Preferences;
+import org.libreoffice.impressremote.util.SavedStates;
 
 public class SlideShowActivity extends SherlockFragmentActivity implements ServiceConnection {
     private static enum Mode {
@@ -65,7 +66,7 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
             return Mode.PAGER;
         }
 
-        return (Mode) aSavedInstanceState.getSerializable("MODE");
+        return (Mode) aSavedInstanceState.getSerializable(SavedStates.Keys.MODE);
     }
 
     private void setUpHomeButton() {
@@ -94,9 +95,9 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private boolean isKeepingScreenOnRequired() {
-        Preferences preferences = Preferences.getSettingsInstance(this);
+        Preferences aPreferences = Preferences.getSettingsInstance(this);
 
-        return preferences.getBoolean(Preferences.Keys.KEEP_SCREEN_ON);
+        return aPreferences.getBoolean(Preferences.Keys.KEEP_SCREEN_ON);
     }
 
     private void bindService() {
@@ -272,9 +273,9 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private boolean areVolumeKeysActionsRequired() {
-        Preferences preferences = Preferences.getSettingsInstance(this);
+        Preferences aPreferences = Preferences.getSettingsInstance(this);
 
-        return preferences.getBoolean(Preferences.Keys.VOLUME_KEYS_ACTIONS);
+        return aPreferences.getBoolean(Preferences.Keys.VOLUME_KEYS_ACTIONS);
     }
 
     private boolean isLastSlideDisplayed() {
@@ -390,8 +391,8 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private void callEditingTimer(Timer aTimer) {
-        DialogFragment aFragment = buildTimerEditingDialog(aTimer);
-        aFragment.show(getSupportFragmentManager(), TimerEditingDialog.TAG);
+        DialogFragment aTimerDialog = buildTimerEditingDialog(aTimer);
+        aTimerDialog.show(getSupportFragmentManager(), TimerEditingDialog.TAG);
 
         aTimer.pause();
     }
@@ -405,8 +406,8 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private void callSettingTimer() {
-        DialogFragment aFragment = TimerSettingDialog.newInstance();
-        aFragment.show(getSupportFragmentManager(), TimerSettingDialog.TAG);
+        DialogFragment aTimerDialog = TimerSettingDialog.newInstance();
+        aTimerDialog.show(getSupportFragmentManager(), TimerSettingDialog.TAG);
     }
 
     private void stopSlideShow() {
@@ -439,7 +440,7 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi
     }
 
     private void saveMode(Bundle aOutState) {
-        aOutState.putSerializable("MODE", mMode);
+        aOutState.putSerializable(SavedStates.Keys.MODE, mMode);
     }
 
     @Override
diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
index acd9e60470bb..f72944ab1a2a 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
@@ -120,8 +120,8 @@ public class ComputerConnectionFragment extends SherlockFragment implements Serv
     }
 
     @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/fragment/SlidesGridFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
index 021a4920fa3f..616fe40f1a81 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java
@@ -44,8 +44,8 @@ public class SlidesGridFragment extends SherlockFragment implements ServiceConne
     }
 
     @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/fragment/SlidesPagerFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
index 08b5cc214832..ae53035d054f 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
@@ -49,8 +49,8 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn
     }
 
     @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/fragment/TimerEditingDialog.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
index dd09f4ba29f1..8c4c81e7a979 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/TimerEditingDialog.java
@@ -20,6 +20,7 @@ import android.widget.TimePicker;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import org.libreoffice.impressremote.R;
+import org.libreoffice.impressremote.util.Fragments;
 import org.libreoffice.impressremote.util.Intents;
 
 public class TimerEditingDialog extends SherlockDialogFragment implements TimePickerDialog.OnTimeSetListener, DialogInterface.OnClickListener {
@@ -40,7 +41,7 @@ public class TimerEditingDialog extends SherlockDialogFragment implements TimePi
     private static Bundle buildArguments(int aMinutes) {
         Bundle aArguments = new Bundle();
 
-        aArguments.putInt("MINUTES", aMinutes);
+        aArguments.putInt(Fragments.Arguments.MINUTES, aMinutes);
 
         return aArguments;
     }
@@ -49,7 +50,7 @@ public class TimerEditingDialog extends SherlockDialogFragment implements TimePi
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mMinutes = getArguments().getInt("MINUTES");
+        mMinutes = getArguments().getInt(Fragments.Arguments.MINUTES);
     }
 
     @Override
diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/Fragments.java b/android/sdremote/src/org/libreoffice/impressremote/util/Fragments.java
index b7dbe6dd764e..89752bf11620 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/Fragments.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Fragments.java
@@ -17,6 +17,8 @@ public final class Fragments {
         }
 
         public static final String COMPUTER = "COMPUTER";
+
+        public static final String MINUTES = "MINUTES";
     }
 }
 
diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java b/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java
index 0b7a1bbc4165..c9339c8c1c01 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java
@@ -12,5 +12,7 @@ public final class SavedStates {
 
         public static final String PIN = "PIN";
         public static final String ERROR_MESSAGE = "ERROR_MESSAGE";
+
+        public static final String MODE = "MODE";
     }
 }