luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-04 20:30:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move setGlobalDurationScale to AegisActivity

Browse source 
Also, rename the method and make the error string translatable
This commit is contained in:
Alexander Bakker 2019-04-16 22:57:13 +02:00
parent 5d835b05ee
commit 92458d0d3b
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/beemdevelopment/aegis/AegisApplication.java
View file

@ -1,6 +1,5 @@
package com.beemdevelopment.aegis;
import android.animation.ValueAnimator;
import android.app.Application;
import android.content.BroadcastReceiver;
import android.content.Context;
@ -10,8 +9,6 @@ import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.graphics.drawable.Icon;
import android.os.Build;
import android.provider.Settings;
import android.widget.Toast;
import com.beemdevelopment.aegis.db.DatabaseManager;
import com.beemdevelopment.aegis.ui.MainActivity;
@ -34,8 +31,6 @@ public class AegisApplication extends Application {
ScreenOffReceiver receiver = new ScreenOffReceiver();
registerReceiver(receiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
setGlobalDurationScale();
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
initAppShortcuts();
}
@ -74,17 +69,6 @@ public class AegisApplication extends Application {
return _prefs.isAutoLockEnabled() && _manager.isEncryptionEnabled() && !_manager.isLocked();
}
private void setGlobalDurationScale() {
float durationScale = Settings.Global.getFloat(getContentResolver(), Settings.Global.ANIMATOR_DURATION_SCALE, 0);
if (durationScale != 1) {
try {
ValueAnimator.class.getMethod("setDurationScale", float.class).invoke(null, 1f);
} catch (Throwable t) {
Toast.makeText(this, "Unable to reset animator duration scale. Progressbars will be invisible", Toast.LENGTH_SHORT).show();
}
}
}
private class ScreenOffReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {

18
app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java
View file

@ -1,8 +1,12 @@
package com.beemdevelopment.aegis.ui;
import android.animation.ValueAnimator;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.view.WindowManager;
import android.widget.Toast;
import com.beemdevelopment.aegis.AegisApplication;
import com.beemdevelopment.aegis.Preferences;
@ -35,6 +39,9 @@ public abstract class AegisActivity extends AppCompatActivity {
// set the theme
setPreferredTheme(Theme.fromInteger(getPreferences().getCurrentTheme()));
// apply a dirty hack to make progress bars work even if animations are disabled
setGlobalAnimationDurationScale();
}
protected AegisApplication getApp() {
@ -58,4 +65,15 @@ public abstract class AegisActivity extends AppCompatActivity {
break;
}
}
private void setGlobalAnimationDurationScale() {
float durationScale = Settings.Global.getFloat(getContentResolver(), Settings.Global.ANIMATOR_DURATION_SCALE, 0);
if (durationScale != 1) {
try {
ValueAnimator.class.getMethod("setDurationScale", float.class).invoke(null, 1f);
} catch (Throwable t) {
Toast.makeText(this, R.string.progressbar_error, Toast.LENGTH_SHORT).show();
}
}
}
}