Merge pull request #1709 from cascheberg/fix-zoom

Move unlimited zoom pref to settings
mozilla · Aug 31, 2015 · 147e57a · 147e57a
2 parents 9c11f7f + 6545298
commit 147e57a
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 56 deletions.
diff --git a/android/src/main/java/org/mozilla/mozstumbler/client/ClientPrefs.java b/android/src/main/java/org/mozilla/mozstumbler/client/ClientPrefs.java
@@ -20,7 +20,7 @@ public class ClientPrefs extends Prefs {
     public static final String CRASH_REPORTING = "crash_reporting";
     public static final int MIN_BATTERY_DEFAULT = 15;
     public static final String LAST_VERSION = "last_version";
-    public static final String IS_MAP_ZOOM_LIMITED = "limited_zoom";
+    public static final String IS_MAP_ZOOM_UNLIMITED = "unlimited_zoom";
     public static final String IS_SCANNING_PASSIVE = "passive_scanning";
     private static final String LOG_TAG = LoggerUtil.makeLogTag(ClientPrefs.class);
     private static final String LAT_PREF = "lat";
@@ -179,12 +179,12 @@ public void setMinBatteryPercent(int percent) {
 
     public enum MapTileResolutionOptions {Default, HighRes, LowRes, NoMap}
 
-    public boolean isMapZoomLimited() {
-        return getBoolPrefWithDefault(IS_MAP_ZOOM_LIMITED, true);
+    public boolean isMapZoomUnlimited() {
+        return getBoolPrefWithDefault(IS_MAP_ZOOM_UNLIMITED, false);
     }
 
-    public void setIsMapZoomLimited(boolean isOn) {
-        setBoolPref(IS_MAP_ZOOM_LIMITED, isOn);
+    public void setIsMapZoomUnlimited(boolean isOn) {
+        setBoolPref(IS_MAP_ZOOM_UNLIMITED, isOn);
     }
 
     public boolean isScanningPassive() {

diff --git a/android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapFragment.java b/android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapFragment.java
@@ -411,7 +411,7 @@ void setHighBandwidthMap(boolean hasNetwork, boolean isHighBandwidth) {
         updateMapResolutionTextView(tileType, isHighBandwidth);
 
         int minZoom = AbstractMapOverlay.getDisplaySizeBasedMinZoomLevel();
-        if (!prefs.isMapZoomLimited()) {
+        if (prefs.isMapZoomUnlimited()) {
             minZoom = isHighBandwidth ? LOWEST_UNLIMITED_ZOOM : LowResMapOverlay.LOW_ZOOM_LEVEL;
         }
         mMap.setMinZoomLevel(minZoom);

diff --git a/android/src/main/java/org/mozilla/mozstumbler/client/subactivities/DeveloperActivity.java b/android/src/main/java/org/mozilla/mozstumbler/client/subactivities/DeveloperActivity.java
@@ -123,7 +123,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
             setupSimulationPreference();
             setupLocationChangeSpinners();
             setupMinPauseTime();
-            setupLimitZoom();
             setupPassiveMode();
             return mRootView;
         }
@@ -165,18 +164,6 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
 
         }
 
-        private void setupLimitZoom() {
-            boolean isLimited = ClientPrefs.getInstance(mRootView.getContext()).isMapZoomLimited();
-            CheckBox button = (CheckBox) mRootView.findViewById(R.id.toggleLimitedMapZoom);
-            button.setChecked(isLimited);
-            button.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-                    ClientPrefs.getInstance(mRootView.getContext()).setIsMapZoomLimited(isChecked);
-                }
-            });
-        }
-
         private void setupPassiveMode() {
             boolean isPassive = ClientPrefs.getInstance(mRootView.getContext()).isScanningPassive();
             CheckBox button = (CheckBox) mRootView.findViewById(R.id.togglePassiveScanning);

diff --git a/android/src/main/java/org/mozilla/mozstumbler/client/subactivities/PreferencesScreen.java b/android/src/main/java/org/mozilla/mozstumbler/client/subactivities/PreferencesScreen.java
@@ -8,7 +8,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
@@ -18,7 +17,6 @@
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
-import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
@@ -55,6 +53,7 @@ public class PreferencesScreen extends PreferenceActivity implements IFxACallbac
     private CheckBoxPreference mKeepScreenOn;
     private CheckBoxPreference mEnableShowMLSLocations;
     private CheckBoxPreference mCrashReportsOn;
+    private CheckBoxPreference mUnlimitedMapZoom;
     private ListPreference mMapTileDetail;
     private Preference mFxaLoginPreference;
 
@@ -91,6 +90,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mMapTileDetail.setValueIndex(valueIndex);
         updateMapDetailTitle(valueIndex);
 
+        mUnlimitedMapZoom = (CheckBoxPreference) getPreferenceManager().findPreference(ClientPrefs.IS_MAP_ZOOM_UNLIMITED);
+
         setPreferenceListener();
         setButtonListeners();
         verifyBearerToken();
@@ -297,6 +298,13 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 return true;
             }
         });
+        mUnlimitedMapZoom.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                getPrefs().setIsMapZoomUnlimited(newValue.equals(true));
+                return true;
+            }
+        });
     }
 
     private boolean hasNetworkForFxA() {

diff --git a/android/src/main/res/layout/fragment_developer_options.xml b/android/src/main/res/layout/fragment_developer_options.xml
@@ -37,27 +37,11 @@
         android:layout_marginTop="10dp"
         android:background="#55ffffff" />
 
-    <CheckBox
-        android:id="@+id/toggleLimitedMapZoom"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/line"
-        android:text="@string/limit_map_zoom" />
-
-    <View
-        android:layout_below="@id/toggleLimitedMapZoom"
-        android:id="@+id/line1"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
-        android:background="#55ffffff" />
-
     <CheckBox
         android:id="@+id/togglePassiveScanning"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/line1"
+        android:layout_below="@id/line"
         android:text="@string/use_passive_scanning" />
 
     <View

diff --git a/android/src/main/res/layout/stumbler_preferences.xml b/android/src/main/res/layout/stumbler_preferences.xml
@@ -27,13 +27,11 @@
             android:key="map_tile_res_options"
             android:summary="@string/map_tile_resolution_options_summary"
             android:title="@string/map_tile_resolution_options_label" />
-        <!-- bug #1476
         <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="limited_zoom"
-            android:summary="@string/limit_map_zoom_summary"
-            android:title="@string/limit_map_zoom" />
-            -->
+            android:defaultValue="false"
+            android:key="unlimited_zoom"
+            android:summary="@string/unlimited_map_zoom_summary"
+            android:title="@string/unlimited_map_zoom" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/category_display">

diff --git a/android/src/main/res/values-de/strings.xml b/android/src/main/res/values-de/strings.xml
@@ -171,14 +171,14 @@
     <string name="sensor_type_significant_motion">Der Sensor zur Erkennung signifikanter Bewegungen bietet die besten Energiesparmöglichkeiten, aber er funktioniert nicht auf allen Geräten. Benutzen Sie diesen Sensortyp nicht, wenn das Scannen trotz Bewegung pausiert bleibt.</string>
 
     <string name="ok">OK</string>
-    <string name="limit_map_zoom">Karte Herauszoomen limitieren</string>
+    <string name="unlimited_map_zoom">Karte unbegrenzt herauszoomen</string>
+    <string name="unlimited_map_zoom_summary">Begrenzter Zoom kann helfen, den Datenverbrauch der Kartenansicht zu verringern. Unbegrenztes Zoomen betrifft nur die Karte mit hoher Auflösung.</string>
     <string name="test_significant_sensor_dialog_title">Sensor für signifikante Bewegungen testen</string>
     <string name="test_significant_sensor_dialog_message">Bleiben Sie stehen, laufen Sie dann 1 Minute lang.\n\nWarte auf Bewegung &#8230;</string>
     <string name="test_significant_sensor_confirmed_working">Bewegung erkannt.\nDer Sensor funktioniert korrekt.</string>
     <string name="button_test_significant_motion_sensor">Sensor für signifikante Bewegungen testen</string>
     <string name="sensor_name_significant_motion">Signifikante Bewegung</string>
     <string name="sensor_name_accelerometer">Beschleunigungssensor</string>
     <string name="title_use_sensor">Sensor benutzen:</string>
-    <string name="limit_map_zoom_summary">Reduziert den Datenverbrauch der Kartenansicht.</string>
 
 </resources>
diff --git a/android/src/main/res/values-es/strings.xml b/android/src/main/res/values-es/strings.xml
@@ -179,13 +179,13 @@
     <string name="sensor_type_significant_motion">El sensor de movimiento significativo ofrece el mejor ahorro de energía, pero puede no funcionar en todos los dispositivos.</string>
 
     <string name="ok">OK</string>
-    <string name="limit_map_zoom">Límite al reducir el zoom en el mapa</string>
+    <!--string name="limit_map_zoom">Límite al reducir el zoom en el mapa</string-->
     <string name="test_significant_sensor_dialog_title">Prueba del sensor de movimiento significativo</string>
     <string name="test_significant_sensor_dialog_message">Permanecer quieto, y luego caminar durante 1 minuto.\n\nDetectando movimiento&#8230;</string>
     <string name="test_significant_sensor_confirmed_working">Movimiento detectado.\nEl sensor funciona con normalidad.</string>
     <string name="button_test_significant_motion_sensor">Prueba del sensor de movimiento significativo</string>
     <string name="sensor_name_significant_motion">Movimiento significativo</string>
     <string name="sensor_name_accelerometer">Acelerómetro</string>
     <string name="title_use_sensor">Usar sensor:</string>
-    <string name="limit_map_zoom_summary">Reduce los datos de red que utiliza la vista del mapa.</string>
+    <!--string name="limit_map_zoom_summary">Reduce los datos de red que utiliza la vista del mapa.</string-->
 </resources>
diff --git a/android/src/main/res/values-pl/strings.xml b/android/src/main/res/values-pl/strings.xml
@@ -202,7 +202,7 @@
     <string name="sensor_type_significant_motion">Znaczący czujnik ruchu umożliwia najlepsze oszczędzanie zasilania, ale może nie działać na wszystkich urządzeniach.</string>
 
     <string name="ok">OK</string>
-    <string name="limit_map_zoom">Ograniczenie oddalania mapy</string>
+    <!--string name="limit_map_zoom">Ograniczenie oddalania mapy</string-->
     <string name="use_passive_scanning">Test skanowania pasywnego</string>
     <string name="test_significant_sensor_dialog_title">Test znaczącego czujnika ruchu</string>
     <string name="test_significant_sensor_dialog_message">Proszę stać w miejscu, po czym chodzić przez jedną minutę.\n\nWykrywanie ruchu: &#8230;</string>
@@ -211,7 +211,7 @@
     <string name="sensor_name_significant_motion">Znaczący ruch</string>
     <string name="sensor_name_accelerometer">Przyspieszeniomierz</string>
     <string name="title_use_sensor">Użycie czujnika:</string>
-    <string name="limit_map_zoom_summary">Zmniejsza zużycie danych przez widok mapy.</string>
+    <!--string name="limit_map_zoom_summary">Zmniejsza zużycie danych przez widok mapy.</string-->
 
     <string name="fxaDescription">Dołączenie do rankingu za pomocą konta Firefoksa</string>
     <string name="fxaDescriptionLoggedIn">Obecnie zalogowano</string>

diff --git a/android/src/main/res/values-tr/strings.xml b/android/src/main/res/values-tr/strings.xml
@@ -179,13 +179,13 @@
     <string name="sensor_type_significant_motion">Önemli hareket algılayıcısı en iyi güç tasarrufunu sağlar, ancak tüm cihazlarda çalışmayabilir.</string>
 
     <string name="ok">Tamam</string>
-    <string name="limit_map_zoom">Haritadan uzaklaşmayı sınırla</string>
+    <!--string name="limit_map_zoom">Haritadan uzaklaşmayı sınırla</string-->
     <string name="test_significant_sensor_dialog_title">Önemli Hareket Algılayıcıyı Sına</string>
     <string name="test_significant_sensor_dialog_message">Sabit durun, ardından 1 dk boyunca yürüyün.\n\nHareket algılanıyor &#8230;</string>
     <string name="test_significant_sensor_confirmed_working">Hareket algılandı.\nAlgılayıcı düzgün çalışıyor.</string>
     <string name="button_test_significant_motion_sensor">Önemli hareket algılayıcıyı sına</string>
     <string name="sensor_name_significant_motion">Önemli hareket</string>
     <string name="sensor_name_accelerometer">İvme ölçer</string>
     <string name="title_use_sensor">Algılayıcı kullan:</string>
-    <string name="limit_map_zoom_summary">Harita görünümünde kullanılacak ağ verisini azaltır.</string>
+    <!--string name="limit_map_zoom_summary">Harita görünümünde kullanılacak ağ verisini azaltır.</string-->
 </resources>
diff --git a/android/src/main/res/values-zh-rTW/strings.xml b/android/src/main/res/values-zh-rTW/strings.xml
@@ -180,13 +180,13 @@
     <string name="sensor_type_significant_motion">顯著運動感測器的省電效果最好，但不是在每台裝置上都能用。</string>
 
     <string name="ok">確定</string>
-    <string name="limit_map_zoom">限制縮小地圖</string>
+    <!--string name="limit_map_zoom">限制縮小地圖</string-->
     <string name="test_significant_sensor_dialog_title">測試顯著運動感測器</string>
     <string name="test_significant_sensor_dialog_message">先站直，然後持續走路一分鐘。\n\n偵測移動中&#8230;</string>
     <string name="test_significant_sensor_confirmed_working">偵測到移動。\n感測器功能正常。</string>
     <string name="button_test_significant_motion_sensor">測試顯著運動感測器</string>
     <string name="sensor_name_significant_motion">顯著運動感測器</string>
     <string name="sensor_name_accelerometer">加速度感測器</string>
     <string name="title_use_sensor">使用感測器:</string>
-    <string name="limit_map_zoom_summary">減少地圖所使用的網路數據量。</string>
+    <!--string name="limit_map_zoom_summary">減少地圖所使用的網路數據量。</string-->
 </resources>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
@@ -198,7 +198,8 @@
     <string name="sensor_type_significant_motion">The significant motion sensor offers the best power saving, but may not work on all devices.</string>
 
     <string name="ok">OK</string>
-    <string name="limit_map_zoom">Limit zooming out on map</string>
+    <string name="unlimited_map_zoom">Unlimited map zoom</string>
+    <string name="unlimited_map_zoom_summary">Limiting zoom can help to reduce the network data used by the map view. Unlimited zoom only applies to high detail map mode.</string>
     <string name="use_passive_scanning">Test Passive Scanning</string>
     <string name="use_high_power_mode">High Power Mode</string>
     <string name="test_significant_sensor_dialog_title">Test Significant Motion Sensor</string>
@@ -208,7 +209,6 @@
     <string name="sensor_name_significant_motion">Significant motion</string>
     <string name="sensor_name_accelerometer">Accelerometer</string>
     <string name="title_use_sensor">Use sensor:</string>
-    <string name="limit_map_zoom_summary">Reduces the network data used by the map view.</string>
 
     <string name="fxaDescription">Use Firefox Accounts to join the leaderboard</string>
     <string name="fxaDescriptionLoggedIn">You are currently logged in</string>