ricky/location_ringer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ringtone should display silent, when silent

Browse Source 
closes #70

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-05-25 11:06:21 -04:00
parent acbae362d9
commit 168b6478a6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/fragments/RingtoneFragment.java
View File

@@ -89,7 +89,7 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
* @author ricky barrette * @author ricky barrette
*/ */
private void getRingtoneURI(int ringtoneCode, String uri){ private void getRingtoneURI(int ringtoneCode, String uri){
Intent intent = new Intent( RingtoneManager.ACTION_RINGTONE_PICKER); final Intent intent = new Intent( RingtoneManager.ACTION_RINGTONE_PICKER);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, ringtoneCode); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, ringtoneCode);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, "Select Tone"); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, "Select Tone");
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true); intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
@@ -127,7 +127,7 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
*/ */
private void notifyVolumeChanged(int progress) { private void notifyVolumeChanged(int progress) {
if(this.mListener != null){ if(this.mListener != null){
ContentValues info = new ContentValues(); final ContentValues info = new ContentValues();
info.put(this.mKeyVolume, progress); info.put(this.mKeyVolume, progress);
this.mListener.onInfoContentChanged(info); this.mListener.onInfoContentChanged(info);
} }
@@ -140,7 +140,7 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
Uri tone = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI); final Uri tone = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
if(tone == null){ if(tone == null){
this.mRingtone.setText(R.string.silent); this.mRingtone.setText(R.string.silent);
mVolume.setEnabled(false); mVolume.setEnabled(false);
@@ -165,8 +165,8 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.ringtone_fragment, container, false); final View view = inflater.inflate(R.layout.ringtone_fragment, container, false);
AudioManager mAudioManager = (AudioManager) this.getActivity().getSystemService(Context.AUDIO_SERVICE); final AudioManager audioManager = (AudioManager) this.getActivity().getSystemService(Context.AUDIO_SERVICE);
if(Debug.DEBUG) if(Debug.DEBUG)
for(Entry<String,Object> item : this.mInfo.valueSet()) for(Entry<String,Object> item : this.mInfo.valueSet())
@@ -175,14 +175,14 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
/* /*
* initialize the views * initialize the views
*/ */
TextView label = (TextView) view.findViewById(R.id.label); final TextView label = (TextView) view.findViewById(R.id.label);
label.setText(mLabel); label.setText(mLabel);
this.mRingtone = (EditText) view.findViewById(R.id.ringtone); this.mRingtone = (EditText) view.findViewById(R.id.ringtone);
mVolume = (SeekBar) view.findViewById(R.id.ringtone_volume); mVolume = (SeekBar) view.findViewById(R.id.ringtone_volume);
this.mRingtone.setOnClickListener(this); this.mRingtone.setOnClickListener(this);
mVolume.setMax(mAudioManager.getStreamMaxVolume(mStream)); mVolume.setMax(audioManager.getStreamMaxVolume(mStream));
/* /*
* ringtone & uri * ringtone & uri
@@ -199,6 +199,7 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
} catch (NullPointerException e) { } catch (NullPointerException e) {
e.printStackTrace(); e.printStackTrace();
mVolume.setEnabled(false); mVolume.setEnabled(false);
mRingtone.setText(R.string.silent);
} }
/* /*
@@ -207,8 +208,8 @@ public class RingtoneFragment extends Fragment implements OnClickListener, OnSee
if(this.mInfo.containsKey(this.mKeyVolume)) if(this.mInfo.containsKey(this.mKeyVolume))
mVolume.setProgress(Integer.parseInt(this.mInfo.getAsString(this.mKeyVolume))); mVolume.setProgress(Integer.parseInt(this.mInfo.getAsString(this.mKeyVolume)));
else { else {
mVolume.setProgress(mAudioManager.getStreamVolume(mStream)); mVolume.setProgress(audioManager.getStreamVolume(mStream));
notifyVolumeChanged(mAudioManager.getStreamVolume(mStream)); notifyVolumeChanged(audioManager.getStreamVolume(mStream));
} }
mVolume.setOnSeekBarChangeListener(this); mVolume.setOnSeekBarChangeListener(this);