Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-01-30 21:11:58 +01:00
commit e44249ee32
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -77,9 +77,9 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
long javaTotal = Runtime.getRuntime().totalMemory() / (1024*1024l); long javaTotal = Runtime.getRuntime().totalMemory() / (1024*1024l);
long dalvikSize = android.os.Debug.getNativeHeapAllocatedSize() / (1024*1024l); long dalvikSize = android.os.Debug.getNativeHeapAllocatedSize() / (1024*1024l);
pref.setSummary(getString(R.string.global_app_allocated_memory_descr, javaAvailMem, javaTotal, dalvikSize)); pref.setSummary(getString(R.string.global_app_allocated_memory_descr, javaAvailMem, javaTotal, dalvikSize));
pref.setEnabled(false); pref.setSelectable(false);
//Use setEnabled(false) only, this way you can produce more contrast by/while tapping it when needed //setEnabled(false) creates bad readability on some devices
//pref.setSelectable(false); //pref.setEnabled(false);
cat.addPreference(pref); cat.addPreference(pref);
// ActivityManager activityManager = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE); // ActivityManager activityManager = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
@ -93,9 +93,9 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
pref.setSummary(getString(R.string.native_app_allocated_memory_descr pref.setSummary(getString(R.string.native_app_allocated_memory_descr
, mem.nativePrivateDirty / 1024, mem.dalvikPrivateDirty / 1024 , mem.otherPrivateDirty / 1024 , mem.nativePrivateDirty / 1024, mem.dalvikPrivateDirty / 1024 , mem.otherPrivateDirty / 1024
, mem.nativePss / 1024, mem.dalvikPss / 1024 , mem.otherPss / 1024)); , mem.nativePss / 1024, mem.dalvikPss / 1024 , mem.otherPss / 1024));
pref.setEnabled(false); pref.setSelectable(false);
//Use setEnabled(false) only, this way you can produce more contrast by/while tapping it when needed //setEnabled(false) creates bad readability on some devices
//pref.setSelectable(false); //pref.setEnabled(false);
cat.addPreference(pref); cat.addPreference(pref);
@ -110,9 +110,9 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
pref.setSummary(getString(R.string.day_night_info_description, "null", pref.setSummary(getString(R.string.day_night_info_description, "null",
"null")); "null"));
} }
pref.setEnabled(false); pref.setSelectable(false);
//Use setEnabled(false) only, this way you can produce more contrast by/while tapping it when needed //setEnabled(false) creates bad readability on some devices
//pref.setSelectable(false); //pref.setEnabled(false);
cat.addPreference(pref); cat.addPreference(pref);
} }

6
OsmAnd/src/net/osmand/plus/monitoring/SettingsMonitoringActivity.java
View file

@ -63,9 +63,9 @@ public class SettingsMonitoringActivity extends SettingsBaseActivity {
Preference globalrecord = new Preference(this); Preference globalrecord = new Preference(this);
globalrecord.setTitle(R.string.save_track_to_gpx_globally_headline); globalrecord.setTitle(R.string.save_track_to_gpx_globally_headline);
globalrecord.setSummary(R.string.save_track_to_gpx_globally_descr); globalrecord.setSummary(R.string.save_track_to_gpx_globally_descr);
globalrecord.setEnabled(false); globalrecord.setSelectable(false);
//Use setEnabled(false) only, this way you can produce more contrast by/while tapping it when needed //setEnabled(false) creates bad readability on some devices
//globalrecord.setSelectable(false); //globalrecord.setEnabled(false);
cat.addPreference(globalrecord); cat.addPreference(globalrecord);
if(settings.SAVE_GLOBAL_TRACK_REMEMBER.get()) { if(settings.SAVE_GLOBAL_TRACK_REMEMBER.get()) {