Fix some warnings.

pmarks-net · Jan 15, 2016 · 48fb3f1 · 48fb3f1
1 parent d5d7fed
commit 48fb3f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/src/main/java/net/pmarks/chromadoze/ChromaDoze.java b/app/src/main/java/net/pmarks/chromadoze/ChromaDoze.java
@@ -27,6 +27,7 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -171,9 +172,8 @@ public void onLockStateChange(LockEvent e) {
 
     // Get the lock icon which reflects the current action.
     private Drawable getLockIcon() {
-        Drawable d = getResources().getDrawable(
-                mUiState.getLocked() ? R.drawable.action_unlock
-                        : R.drawable.action_lock);
+        Drawable d = ContextCompat.getDrawable(this, mUiState.getLocked() ?
+                R.drawable.action_unlock : R.drawable.action_lock);
         if (mUiState.getLockBusy()) {
             d.setColorFilter(0xFFFF4444, Mode.SRC_IN);
         } else {
@@ -233,7 +233,7 @@ private void changeFragment(Fragment f, boolean allowBack) {
         if (allowBack) {
             transaction.addToBackStack(null);
             transaction
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+                    .setTransition(FragmentTransaction.TRANSIT_NONE);
         }
         transaction.commit();
     }
@@ -308,7 +308,7 @@ public void onNothingSelected(AdapterView<?> parent) {
     }
 
     private Drawable getScaledImage(int resource, int size) {
-        Bitmap b = ((BitmapDrawable) getResources().getDrawable(resource)).getBitmap();
+        Bitmap b = ((BitmapDrawable) ContextCompat.getDrawable(this, resource)).getBitmap();
         Bitmap bitmapResized = Bitmap.createScaledBitmap(b, size, size, true);
         return new BitmapDrawable(getResources(), bitmapResized);
     }

diff --git a/app/src/main/java/net/pmarks/chromadoze/NoiseService.java b/app/src/main/java/net/pmarks/chromadoze/NoiseService.java
@@ -29,7 +29,6 @@
 import android.os.Message;
 import android.os.PowerManager;
 import android.support.v4.app.NotificationCompat;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -38,7 +37,6 @@
 
 import junit.framework.Assert;
 
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Date;