Added new drawables for the following features:
bluetooth wifi volume ringtone closes #81 closes #82 closes #83 closes #84
@@ -2,29 +2,23 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.TwentyCodes.android.LocationRinger"
|
package="com.TwentyCodes.android.LocationRinger"
|
||||||
android:installLocation="internalOnly"
|
android:installLocation="internalOnly"
|
||||||
android:versionCode="35"
|
android:versionCode="57"
|
||||||
android:versionName="73dbdc0" >
|
android:versionName="10b9420" >
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="7" />
|
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
|
||||||
|
|
||||||
<uses-feature
|
<uses-feature
|
||||||
android:name="android.hardware.location"
|
android:name="android.hardware.location"
|
||||||
android:required="true" />
|
android:required="true" />
|
||||||
<uses-feature
|
<uses-feature
|
||||||
android:name="android.hardware.location.gps"
|
android:name="android.hardware.location.gps"
|
||||||
android:required="false" />
|
android:required="true" />
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
|
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
|
||||||
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH" />
|
<uses-permission android:name="android.permission.BLUETOOTH" />
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
||||||
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||||
|
|
||||||
|
|||||||
@@ -11,5 +11,5 @@ android.library.reference.1=../../exception_handler_library/ExceptionHandlerLib
|
|||||||
android.library.reference.2=../../location_library/LocationLib
|
android.library.reference.2=../../location_library/LocationLib
|
||||||
proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.cfg
|
proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.cfg
|
||||||
# Project target.
|
# Project target.
|
||||||
target=Google Inc.:Google APIs:15
|
target=Google Inc.:Google APIs:16
|
||||||
manifestmerger.enabled=true
|
manifestmerger.enabled=true
|
||||||
|
|||||||
BIN
LocationRinger/res/drawable-hdpi/ic_action_bluetooth.png
Normal file
|
After Width: | Height: | Size: 818 B |
BIN
LocationRinger/res/drawable-hdpi/ic_action_silent.png
Normal file
|
After Width: | Height: | Size: 405 B |
BIN
LocationRinger/res/drawable-hdpi/ic_action_volume.png
Normal file
|
After Width: | Height: | Size: 661 B |
BIN
LocationRinger/res/drawable-hdpi/ic_action_wifi.png
Normal file
|
After Width: | Height: | Size: 850 B |
BIN
LocationRinger/res/drawable-ldpi/ic_action_bluetooth.png
Normal file
|
After Width: | Height: | Size: 375 B |
BIN
LocationRinger/res/drawable-ldpi/ic_action_silent.png
Normal file
|
After Width: | Height: | Size: 218 B |
BIN
LocationRinger/res/drawable-ldpi/ic_action_volume.png
Normal file
|
After Width: | Height: | Size: 298 B |
BIN
LocationRinger/res/drawable-ldpi/ic_action_wifi.png
Normal file
|
After Width: | Height: | Size: 374 B |
BIN
LocationRinger/res/drawable-mdpi/ic_action_bluetooth.png
Normal file
|
After Width: | Height: | Size: 473 B |
BIN
LocationRinger/res/drawable-mdpi/ic_action_silent.png
Normal file
|
After Width: | Height: | Size: 259 B |
BIN
LocationRinger/res/drawable-mdpi/ic_action_volume.png
Normal file
|
After Width: | Height: | Size: 390 B |
BIN
LocationRinger/res/drawable-mdpi/ic_action_wifi.png
Normal file
|
After Width: | Height: | Size: 465 B |
BIN
LocationRinger/res/drawable-xhdpi/ic_action_bluetooth.png
Normal file
|
After Width: | Height: | Size: 905 B |
BIN
LocationRinger/res/drawable-xhdpi/ic_action_silent.png
Normal file
|
After Width: | Height: | Size: 464 B |
BIN
LocationRinger/res/drawable-xhdpi/ic_action_volume.png
Normal file
|
After Width: | Height: | Size: 728 B |
BIN
LocationRinger/res/drawable-xhdpi/ic_action_wifi.png
Normal file
|
After Width: | Height: | Size: 879 B |
@@ -105,11 +105,11 @@ public class FeatureListFragment extends BaseFragmentListFragment implements OnC
|
|||||||
mAdded.add(KEY_ADDED_MUSIC_VOLUME);
|
mAdded.add(KEY_ADDED_MUSIC_VOLUME);
|
||||||
break;
|
break;
|
||||||
case KEY_ADDED_BT:
|
case KEY_ADDED_BT:
|
||||||
f = new ToggleButtonFragment(android.R.drawable.stat_sys_data_bluetooth, this.getString(R.string.bluetooth), RingerDatabase.KEY_BT, this.mInfo, this.mListener, this, KEY_ADDED_BT);
|
f = new ToggleButtonFragment(R.drawable.ic_action_bluetooth, this.getString(R.string.bluetooth), RingerDatabase.KEY_BT, this.mInfo, this.mListener, this, KEY_ADDED_BT);
|
||||||
mAdded.add(KEY_ADDED_BT);
|
mAdded.add(KEY_ADDED_BT);
|
||||||
break;
|
break;
|
||||||
case KEY_ADDED_WIFI:
|
case KEY_ADDED_WIFI:
|
||||||
f = new ToggleButtonFragment(android.R.drawable.stat_sys_data_bluetooth, this.getString(R.string.wifi), RingerDatabase.KEY_WIFI, this.mInfo, this.mListener, this, KEY_ADDED_WIFI);
|
f = new ToggleButtonFragment(R.drawable.ic_action_wifi, this.getString(R.string.wifi), RingerDatabase.KEY_WIFI, this.mInfo, this.mListener, this, KEY_ADDED_WIFI);
|
||||||
mAdded.add(KEY_ADDED_WIFI);
|
mAdded.add(KEY_ADDED_WIFI);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList
|
|||||||
* @author ricky barrette
|
* @author ricky barrette
|
||||||
*/
|
*/
|
||||||
private void notifyVolumeChanged(int progress) {
|
private void notifyVolumeChanged(int progress) {
|
||||||
setIcon(progress == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
|
setIcon(progress == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
|
||||||
if(this.mChangedListener != null){
|
if(this.mChangedListener != null){
|
||||||
final ContentValues info = new ContentValues();
|
final ContentValues info = new ContentValues();
|
||||||
info.put(this.mKeyVolume, progress);
|
info.put(this.mKeyVolume, progress);
|
||||||
@@ -180,7 +180,7 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList
|
|||||||
final TextView label = (TextView) view.findViewById(R.id.title);
|
final TextView label = (TextView) view.findViewById(R.id.title);
|
||||||
label.setText(mLabel);
|
label.setText(mLabel);
|
||||||
|
|
||||||
setIcon(android.R.drawable.ic_lock_silent_mode_off);
|
setIcon(R.drawable.ic_action_volume);
|
||||||
|
|
||||||
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);
|
||||||
@@ -223,7 +223,7 @@ public class RingtoneFragment extends BaseFeatureFragment implements OnClickList
|
|||||||
mVolume.setProgress(0);
|
mVolume.setProgress(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
setIcon(mVolume.getProgress() == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
|
setIcon(mVolume.getProgress() == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
|
||||||
|
|
||||||
mVolume.setOnSeekBarChangeListener(this);
|
mVolume.setOnSeekBarChangeListener(this);
|
||||||
return view;
|
return view;
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ public class VolumeFragment extends BaseFeatureFragment implements OnSeekBarChan
|
|||||||
else
|
else
|
||||||
notifyListener(this.mAudioManager.getStreamVolume(mStream));
|
notifyListener(this.mAudioManager.getStreamVolume(mStream));
|
||||||
|
|
||||||
setIcon(volume.getProgress() == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
|
setIcon(volume.getProgress() == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -135,7 +135,7 @@ public class VolumeFragment extends BaseFeatureFragment implements OnSeekBarChan
|
|||||||
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
|
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
|
||||||
if(fromUser){
|
if(fromUser){
|
||||||
notifyListener(progress);
|
notifyListener(progress);
|
||||||
setIcon(progress == 0 ? android.R.drawable.ic_lock_silent_mode : android.R.drawable.ic_lock_silent_mode_off);
|
setIcon(progress == 0 ? R.drawable.ic_action_silent : R.drawable.ic_action_volume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||