TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-overlay-app

Browse Source 
Conflicts:
	calculatorpp/AndroidManifest.xml
	calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
This commit is contained in:
Sergey Solovyev
2012-11-24 14:35:06 +04:00
parent ac5421a6c0 0fbe345b09
commit cd41a35093
9 changed files with 157 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
calculatorpp/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
View File

@@ -1,7 +1,12 @@
package org.solovyev.android.calculator;
import android.*;
import android.Manifest;
import android.app.Activity;
import android.app.KeyguardManager;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.util.Log;
@@ -60,6 +65,14 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
theme = CalculatorPreferences.Gui.theme.getPreferenceNoError(preferences);
preferences.registerOnSharedPreferenceChangeListener(this);
// let's disable locking of screen for monkeyrunner
// NOTE: this code is only for monkeyrunner
final String permission = Manifest.permission.DISABLE_KEYGUARD;
if (activity.checkCallingOrSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
final KeyguardManager km = (KeyguardManager) activity.getSystemService(Context.KEYGUARD_SERVICE);
km.newKeyguardLock(activity.getClass().getName()).disableKeyguard();
}
}
public void logDebug(@NotNull String message) {

1
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
View File

@@ -13,6 +13,7 @@ import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.external.AndroidExternalListenersContainer;
import org.solovyev.android.calculator.history.AndroidCalculatorHistory;
import org.solovyev.android.calculator.model.AndroidCalculatorEngine;
import org.solovyev.android.calculator.widget.CalculatorWidgetHelper;
/**
* User: serso