Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: 091labs/lo-lo
base: c585c14647
...
head fork: 091labs/lo-lo
compare: 164c9e6fd3
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 11, 2012
Carles Sentis small changes on prefs 164c9e6
Showing with 6 additions and 14 deletions.
  1. +6 −14 src/com/codeskraps/lolo/PrefsActivity.java
View
20 src/com/codeskraps/lolo/PrefsActivity.java
@@ -69,9 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
chkSync = (CheckBoxPreference) findPreference(Constants.SHOW_SYNC);
chk24 = (CheckBoxPreference) findPreference(Constants.HOUR24);
lstInterval = (ListPreference) findPreference(Constants.INTERVAL);
- Preference prefAbout = (Preference) findPreference(Constants.ABOUT);
-
- prefAbout.setOnPreferenceClickListener(this);
+ ((Preference) findPreference(Constants.ABOUT)).setOnPreferenceClickListener(this);
}
@Override
@@ -122,8 +120,8 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
if (BuildConfig.DEBUG) Log.d(TAG, "onSharedPreferenceChanged");
if (key.equals(Constants.HOUR24)) {
- if (prefs.getBoolean(Constants.HOUR24, true))
- chk24.setSummary(getString(R.string.prefs24_summaryTwo));
+ if (prefs.getBoolean(Constants.HOUR24, true)) chk24
+ .setSummary(getString(R.string.prefs24_summaryTwo));
else chk24.setSummary(getString(R.string.prefs24_summaryOne));
} else if (key.equals(Constants.ONCLICK)) {
@@ -162,18 +160,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
@Override
public void onBackPressed() {
+ if (BuildConfig.DEBUG) Log.d(TAG, "onBackPressed");
// This will be called either automatically for you on 2.0
// or later, or by the code above on earlier versions of the
// platform.
- if (BuildConfig.DEBUG) Log.d(TAG, "onBackPressed");
- resultIntent();
- finish();
- return;
- }
-
- private void resultIntent() {
- if (BuildConfig.DEBUG) Log.d(TAG, "resultIntent");
-
if (Constants.CONFIGURE_ACTION.equals(getIntent().getAction())) {
Intent intent = getIntent();
Bundle extras = intent.getExtras();
@@ -187,6 +177,8 @@ private void resultIntent() {
}
}
sendBroadcast(new Intent(Constants.FORCE_WIDGET_UPDATE));
+
+ super.onBackPressed();
}
@Override

No commit comments for this range

Something went wrong with that request. Please try again.