From 6f42994da5c671e4819679d2db52f7612c7c40f5 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Tue, 2 Sep 2014 20:15:02 -0400 Subject: [PATCH] Updated all logging to verbose and disabled it --- .../ui/fragments/BaseFragmentListFragment.java | 11 +++++------ .../ui/fragments/RingtoneFragment.java | 9 +++++---- .../ui/fragments/VolumeFragment.java | 17 +++++++---------- location_library | 2 +- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/BaseFragmentListFragment.java b/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/BaseFragmentListFragment.java index a7d8665..b14bff8 100644 --- a/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/BaseFragmentListFragment.java +++ b/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/BaseFragmentListFragment.java @@ -6,11 +6,6 @@ */ package org.RickBarrette.android.LocationRinger.ui.fragments; -import java.util.ArrayList; -import java.util.Collections; - -import org.RickBarrette.android.LocationRinger.Log; - import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -18,6 +13,10 @@ import android.support.v4.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import org.RickBarrette.android.LocationRinger.Log; + +import java.util.ArrayList; +import java.util.Collections; /** @@ -89,7 +88,7 @@ public abstract class BaseFragmentListFragment extends Fragment { * Adds a collection ofs fragments to the list, but doesn't preform any * transactions * - * @param fragment + * @param fragments * @author ricky barrette */ protected void addAllInit(final ArrayList fragments) { diff --git a/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/RingtoneFragment.java b/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/RingtoneFragment.java index e62707e..78b23e6 100644 --- a/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/RingtoneFragment.java +++ b/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/RingtoneFragment.java @@ -100,8 +100,8 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, uri); - if (Constraints.DEBUG) - Log.d(TAG, TAG + ".getRingtoneURI " + this.getFragmentId()); + if (Constraints.VERBOSE) + Log.v(TAG, TAG + ".getRingtoneURI " + this.getFragmentId()); FragmentActivity activity = this.getActivity(); if ( activity instanceof RingerInformationActivity) @@ -179,8 +179,9 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList final View view = super.onCreateView(inflater, container, savedInstanceState); final AudioManager audioManager = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); - for (final Entry item : mInfo.valueSet()) - Log.d(TAG, item.getKey() + " = " + item.getValue()); + if(Constraints.VERBOSE) + for (final Entry item : mInfo.valueSet()) + Log.v(TAG, item.getKey() + " = " + item.getValue()); /* * initialize the views diff --git a/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/VolumeFragment.java b/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/VolumeFragment.java index bd94fbe..fadc908 100644 --- a/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/VolumeFragment.java +++ b/LocationRinger/src/org/RickBarrette/android/LocationRinger/ui/fragments/VolumeFragment.java @@ -6,14 +6,6 @@ */ package org.RickBarrette.android.LocationRinger.ui.fragments; -import java.util.Map.Entry; - -import org.RickBarrette.android.LocationRinger.FeatureRemovedListener; -import org.RickBarrette.android.LocationRinger.Log; -import org.RickBarrette.android.LocationRinger.OnContentChangedListener; -import org.RickBarrette.android.LocationRinger.R; -import org.RickBarrette.android.LocationRinger.db.RingerDatabase; - import android.annotation.SuppressLint; import android.content.ContentValues; import android.content.Context; @@ -25,6 +17,10 @@ import android.view.ViewGroup; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; +import org.RickBarrette.android.LocationRinger.*; +import org.RickBarrette.android.LocationRinger.db.RingerDatabase; + +import java.util.Map.Entry; /** * This fragment will represent the volume fragments @@ -126,8 +122,9 @@ public class VolumeFragment extends BaseFeatureFragment implements OnSeekBarChan @Override public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) { - for (final Entry item : mInfo.valueSet()) - Log.d(TAG, item.getKey() + " = " + item.getValue()); + if(Constraints.VERBOSE) + for (final Entry item : mInfo.valueSet()) + Log.v(TAG, item.getKey() + " = " + item.getValue()); final View view = super.onCreateView(inflater, container, savedInstanceState); final TextView label = (TextView) view.findViewById(R.id.title); diff --git a/location_library b/location_library index 4510730..fcb4aec 160000 --- a/location_library +++ b/location_library @@ -1 +1 @@ -Subproject commit 45107300d1de9d5164dd691cef93ba197609e68b +Subproject commit fcb4aecf8a635e60f59a389777a13e00f3da27ac