Switch most instances of getApplicationContext() over to U.getDisplayContext()

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index ee23f36..0614ead 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -559,7 +559,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
                 }
 
                 U.launchApp(
-                        getApplicationContext(),
+                        U.getDisplayContext(this),
                         entry,
                         windowSize,
                         false,
@@ -585,7 +585,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
             case "shortcut_4":
             case "shortcut_5":
                 U.startShortcut(
-                        getApplicationContext(),
+                        U.getDisplayContext(this),
                         entry,
                         shortcuts.get(Integer.parseInt(p.getKey().replace("shortcut_", "")) - 1),
                         getListView().getChildAt(p.getOrder()));
@@ -603,7 +603,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
                     intent.putExtra("no_shadow", true);
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
 
-                    U.startActivityMaximized(getApplicationContext(), intent);
+                    U.startActivityMaximized(U.getDisplayContext(this), intent);
                 } else {
                     try {
                         startActivity(intent);
@@ -698,7 +698,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
                     intent2.putExtra("no_shadow", true);
                     intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
 
-                    U.startActivityMaximized(getApplicationContext(), intent2);
+                    U.startActivityMaximized(U.getDisplayContext(this), intent2);
                 } else {
                     try {
                         startActivity(intent2);
@@ -722,7 +722,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
 
                 Intent intent3 = Intent.createChooser(new Intent(Intent.ACTION_SET_WALLPAPER), getString(R.string.tb_set_wallpaper));
                 intent3.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                U.startActivityMaximized(getApplicationContext(), intent3);
+                U.startActivityMaximized(U.getDisplayContext(this), intent3);
 
                 showStartMenu = false;
                 shouldHideTaskbar = true;

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
index 1a74553..3e05e15 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
@@ -130,7 +130,7 @@ public class InvisibleActivityFreeform extends Activity {
                         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         intent.putExtra("power_button_warning", true);
 
-                        U.startActivityMaximized(getApplicationContext(), intent);
+                        U.startActivityMaximized(U.getDisplayContext(this), intent);
                     }
                 }, 100);
             }

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java
index 5aaedf0..76b8436 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java
@@ -72,7 +72,7 @@ public class KeyboardShortcutActivity extends Activity {
                                 && U.isFreeformModeEnabled(this)
                                 && isInMultiWindowMode()) {
                             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-                            U.startActivityMaximized(getApplicationContext(), intent);
+                            U.startActivityMaximized(U.getDisplayContext(this), intent);
                         } else {
                             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                             startActivity(intent);

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
index b400966..505ade1 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
@@ -221,7 +221,7 @@ public abstract class SettingsFragment extends PreferenceFragment implements Pre
     public void addPreferencesFromResource(@XmlRes int preferencesResId) {
         if(!(this instanceof AboutFragment)) {
             try {
-                Context context = U.wrapContext(getActivity().getApplicationContext());
+                Context context = U.wrapContext(U.getDisplayContext(getActivity()));
                 Class.forName("android.preference.PreferenceManager")
                         .getMethod("inflateFromResource", Context.class, int.class, PreferenceScreen.class)
                         .invoke(getPreferenceManager(), context, preferencesResId, getPreferenceScreen());

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index 6c172fb..a1ba061 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -1872,7 +1872,7 @@ public class U {
         drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
         drawable.draw(canvas);
 
-        int iconSize = context.getApplicationContext().getResources().getDimensionPixelSize(iconSizeRes);
+        int iconSize = getDisplayContext(context).getResources().getDimensionPixelSize(iconSizeRes);
         Bitmap resizedBitmap = Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, true);
 
         return new BitmapDrawable(context.getResources(), resizedBitmap);