From 47e62a568157ccb48e0b8855e301351d9be0c44a Mon Sep 17 00:00:00 2001 From: dvdandroid Date: Wed, 24 May 2017 21:21:15 +0200 Subject: [PATCH] Small code cleanup --- .../com/topjohnwu/magisk/AboutActivity.java | 15 --------------- .../com/topjohnwu/magisk/SettingsActivity.java | 15 --------------- .../topjohnwu/magisk/components/Activity.java | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java index 20680e375..44d3298e6 100644 --- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java @@ -13,7 +13,6 @@ import android.text.Spanned; import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.view.View; -import android.view.WindowManager; import android.widget.TextView; import com.topjohnwu.magisk.components.AboutCardRow; @@ -135,18 +134,4 @@ public class AboutActivity extends Activity { setFloating(); } - public void setFloating() { - boolean isTablet = getResources().getBoolean(R.bool.isTablet); - if (isTablet) { - WindowManager.LayoutParams params = getWindow().getAttributes(); - params.height = getResources().getDimensionPixelSize(R.dimen.floating_height); - params.width = getResources().getDimensionPixelSize(R.dimen.floating_width); - params.alpha = 1.0f; - params.dimAmount = 0.6f; - params.flags |= 2; - getWindow().setAttributes(params); - setFinishOnTouchOutside(true); - } - } - } diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java index de50b8806..bc6fbe2bf 100644 --- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java @@ -9,7 +9,6 @@ import android.preference.PreferenceManager; import android.preference.PreferenceScreen; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; -import android.view.WindowManager; import android.widget.Toast; import com.topjohnwu.magisk.asyncs.MagiskHide; @@ -55,20 +54,6 @@ public class SettingsActivity extends Activity { } - public void setFloating() { - boolean isTablet = getResources().getBoolean(R.bool.isTablet); - if (isTablet) { - WindowManager.LayoutParams params = getWindow().getAttributes(); - params.height = getResources().getDimensionPixelSize(R.dimen.floating_height); - params.width = getResources().getDimensionPixelSize(R.dimen.floating_width); - params.alpha = 1.0f; - params.dimAmount = 0.6f; - params.flags |= 2; - getWindow().setAttributes(params); - setFinishOnTouchOutside(true); - } - } - public static class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/app/src/main/java/com/topjohnwu/magisk/components/Activity.java b/app/src/main/java/com/topjohnwu/magisk/components/Activity.java index 87bcd6b0e..055d2b19a 100644 --- a/app/src/main/java/com/topjohnwu/magisk/components/Activity.java +++ b/app/src/main/java/com/topjohnwu/magisk/components/Activity.java @@ -1,8 +1,10 @@ package com.topjohnwu.magisk.components; import android.support.v7.app.AppCompatActivity; +import android.view.WindowManager; import com.topjohnwu.magisk.MagiskManager; +import com.topjohnwu.magisk.R; public class Activity extends AppCompatActivity { @@ -10,4 +12,19 @@ public class Activity extends AppCompatActivity { public MagiskManager getApplicationContext() { return (MagiskManager) super.getApplicationContext(); } + + protected void setFloating() { + boolean isTablet = getResources().getBoolean(R.bool.isTablet); + if (isTablet) { + WindowManager.LayoutParams params = getWindow().getAttributes(); + params.height = getResources().getDimensionPixelSize(R.dimen.floating_height); + params.width = getResources().getDimensionPixelSize(R.dimen.floating_width); + params.alpha = 1.0f; + params.dimAmount = 0.6f; + params.flags |= 2; + getWindow().setAttributes(params); + setFinishOnTouchOutside(true); + } + } + }