Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6526c269 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

changes:

- Default to Sensor Privacy Preference by default
- Move Sensor Privacy Preference to the top & sort it in the code as
  well.
- For the Sensor Privacy toast pass the inverted state, as the string
  speaks about camera & mic access
parent 9331ba8c
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@
    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
    android:title="@string/switch_settings_title">

    <SwitchPreferenceCompat
        android:key="sensor_privacy"
        android:title="@string/sensor_privacy_title"
        android:summary="@string/sensor_privacy_summary"
        android:defaultValue="true" />

    <SwitchPreferenceCompat
        android:key="fairphone_moments"
        android:title="@string/fairphone_moments_title"
@@ -44,10 +50,4 @@
        android:summary="@string/battery_saver_summary"
        android:defaultValue="false" />
        
    <SwitchPreferenceCompat
        android:key="sensor_privacy"
        android:title="@string/sensor_privacy_title"
        android:summary="@string/sensor_privacy_summary"
        android:defaultValue="true" />

</PreferenceScreen>
+3 −3
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ public class SliderSwitchHandlerService extends Service {
    private static final String TAG = "SliderSwitchHandlerService";

    // Keys must match the Fragment
    private static final String KEY_SENSOR_PRIVACY   = "sensor_privacy";
    private static final String KEY_FAIRPHONE_MOMENTS = "fairphone_moments"; // hidden/no-op
    private static final String KEY_DO_NOT_DISTURB   = "do_not_disturb";
    private static final String KEY_FLIGHT_MODE      = "flight_mode";
    private static final String KEY_TORCH_LIGHT      = "torch_light";
    private static final String KEY_DARK_LIGHT_MODE  = "dark_light_mode";
    private static final String KEY_BATTERY_SAVER    = "battery_saver";
    private static final String KEY_SENSOR_PRIVACY   = "sensor_privacy";

    private static final String PREF_SWITCH_FUNCTION = "switch_function";
    private static final String MUTE_MEDIA_WITH_SILENT = "mute_media_with_silent";
@@ -105,7 +105,7 @@ public class SliderSwitchHandlerService extends Service {
            switch (selection) {
                case KEY_SENSOR_PRIVACY:
                    setSensorPrivacy(state);
                    showToast(KEY_SENSOR_PRIVACY, state);
                    showToast(KEY_SENSOR_PRIVACY, !state);
                    break;

                case KEY_DO_NOT_DISTURB:
+13 −13
Original line number Diff line number Diff line
@@ -17,25 +17,25 @@ public class SwitchSettingsFragment extends PreferenceFragmentCompat implements

    private static final String TAG = "SwitchFragment";

    private static final String KEY_SENSOR_PRIVACY   = "sensor_privacy";
    private static final String KEY_FAIRPHONE_MOMENTS = "fairphone_moments";
    private static final String KEY_DO_NOT_DISTURB   = "do_not_disturb";
    private static final String KEY_FLIGHT_MODE      = "flight_mode";
    private static final String KEY_TORCH_LIGHT      = "torch_light";
    private static final String KEY_DARK_LIGHT_MODE  = "dark_light_mode";
    private static final String KEY_BATTERY_SAVER    = "battery_saver";
    private static final String KEY_SENSOR_PRIVACY   = "sensor_privacy";

    private static final String PREF_SWITCH_FUNCTION = "switch_function";

    // Fairphone Moments intentionally disabled for now
    private SwitchPreferenceCompat mSensorPrivacyPref;
    private SwitchPreferenceCompat mDoNotDisturbPref;
    private SwitchPreferenceCompat mFlightModePref;
    private SwitchPreferenceCompat mTorchLightPref;
    private SwitchPreferenceCompat mDarkLightModePref;
    private SwitchPreferenceCompat mBatterySaverPref;
    private SwitchPreferenceCompat mSensorPrivacyPref;

    private String mCurrentSelection = KEY_DO_NOT_DISTURB;
    private String mCurrentSelection = KEY_SENSOR_PRIVACY;

    @Override
    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -45,27 +45,27 @@ public class SwitchSettingsFragment extends PreferenceFragmentCompat implements
        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        final SwitchPreferenceCompat fairphoneMomentsPref = findPreference(KEY_FAIRPHONE_MOMENTS);
        mSensorPrivacyPref  = findPreference(KEY_SENSOR_PRIVACY);
        mDoNotDisturbPref   = findPreference(KEY_DO_NOT_DISTURB);
        mFlightModePref     = findPreference(KEY_FLIGHT_MODE);
        mTorchLightPref     = findPreference(KEY_TORCH_LIGHT);
        mDarkLightModePref  = findPreference(KEY_DARK_LIGHT_MODE);
        mBatterySaverPref   = findPreference(KEY_BATTERY_SAVER);
        mSensorPrivacyPref  = findPreference(KEY_SENSOR_PRIVACY);

        // Hide Fairphone Moments until implemented
        if (fairphoneMomentsPref != null) {
            fairphoneMomentsPref.setVisible(false);
        }

        final String persisted = prefs.getString(PREF_SWITCH_FUNCTION, KEY_DO_NOT_DISTURB);
        mCurrentSelection = isSelectableKey(persisted) ? persisted : KEY_DO_NOT_DISTURB;
        final String persisted = prefs.getString(PREF_SWITCH_FUNCTION, KEY_SENSOR_PRIVACY);
        mCurrentSelection = isSelectableKey(persisted) ? persisted : KEY_SENSOR_PRIVACY;

        setUpRadioBehavior(mSensorPrivacyPref,  KEY_SENSOR_PRIVACY);
        setUpRadioBehavior(mDoNotDisturbPref,   KEY_DO_NOT_DISTURB);
        setUpRadioBehavior(mFlightModePref,     KEY_FLIGHT_MODE);
        setUpRadioBehavior(mTorchLightPref,     KEY_TORCH_LIGHT);
        setUpRadioBehavior(mDarkLightModePref,  KEY_DARK_LIGHT_MODE);
        setUpRadioBehavior(mBatterySaverPref,   KEY_BATTERY_SAVER);
        setUpRadioBehavior(mSensorPrivacyPref,  KEY_SENSOR_PRIVACY);

        updateSwitchStates();
    }
@@ -124,12 +124,12 @@ public class SwitchSettingsFragment extends PreferenceFragmentCompat implements
    }

    private void updateSwitchStates() {
        setCheckedIfNotNull(mSensorPrivacyPref, KEY_SENSOR_PRIVACY.equals(mCurrentSelection));
        setCheckedIfNotNull(mDoNotDisturbPref,  KEY_DO_NOT_DISTURB.equals(mCurrentSelection));
        setCheckedIfNotNull(mFlightModePref,    KEY_FLIGHT_MODE.equals(mCurrentSelection));
        setCheckedIfNotNull(mTorchLightPref,    KEY_TORCH_LIGHT.equals(mCurrentSelection));
        setCheckedIfNotNull(mDarkLightModePref, KEY_DARK_LIGHT_MODE.equals(mCurrentSelection));
        setCheckedIfNotNull(mBatterySaverPref,  KEY_BATTERY_SAVER.equals(mCurrentSelection));
        setCheckedIfNotNull(mSensorPrivacyPref, KEY_SENSOR_PRIVACY.equals(mCurrentSelection));
    }

    private void setCheckedIfNotNull(SwitchPreferenceCompat pref, boolean checked) {
@@ -145,23 +145,23 @@ public class SwitchSettingsFragment extends PreferenceFragmentCompat implements
    private String getFunctionDisplayName(String function) {
        switch (function) {
            // case KEY_FAIRPHONE_MOMENTS: return "Fairphone Moments"; // Re-enable when ready
            case KEY_SENSOR_PRIVACY:   return "Sensor Privacy";
            case KEY_DO_NOT_DISTURB:   return "Do Not Disturb";
            case KEY_FLIGHT_MODE:      return "Flight Mode";
            case KEY_TORCH_LIGHT:      return "Torch Light";
            case KEY_DARK_LIGHT_MODE:  return "Dark & Light Mode";
            case KEY_BATTERY_SAVER:    return "Battery Saver";
            case KEY_SENSOR_PRIVACY:   return "Sensor Privacy";
            default:                   return "Unknown";
        }
    }

    private boolean isSelectableKey(@NonNull String key) {
        // if (KEY_FAIRPHONE_MOMENTS.equals(key)) return false;
        return KEY_DO_NOT_DISTURB.equals(key)
        return KEY_SENSOR_PRIVACY.equals(key)
                || KEY_DO_NOT_DISTURB.equals(key)
                || KEY_FLIGHT_MODE.equals(key)
                || KEY_TORCH_LIGHT.equals(key)
                || KEY_DARK_LIGHT_MODE.equals(key)
                || KEY_BATTERY_SAVER.equals(key)
                || KEY_SENSOR_PRIVACY.equals(key);
                || KEY_BATTERY_SAVER.equals(key);
    }
}