vayu: parts: Fix HBM state did not displayed properly

Change-Id: I922cf32dff1193cc78718c2f385023f2a75a965c

1 files changed, 11 insertions, 4 deletions

diff --git a/parts/src/org/lineageos/settings/display/LcdFeaturesPreferenceFragment.java b/parts/src/org/lineageos/settings/display/LcdFeaturesPreferenceFragment.java
index ee91144..54bde23 100644
--- a/parts/src/org/lineageos/settings/display/LcdFeaturesPreferenceFragment.java
+++ b/parts/src/org/lineageos/settings/display/LcdFeaturesPreferenceFragment.java
@@ -56,8 +56,9 @@ public class LcdFeaturesPreferenceFragment extends PreferenceFragment
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.lcd_features_settings);
         mHbmPref = (SwitchPreference) findPreference(KEY_HBM);
-        mHbmPref.setOnPreferenceChangeListener(this);
         mCabcPref = (ListPreference) findPreference(KEY_CABC);
+        restorePreferenceState();
+        mHbmPref.setOnPreferenceChangeListener(this);
         mCabcPref.setOnPreferenceChangeListener(this);
         validateKernelSupport();
     }
@@ -65,9 +66,7 @@ public class LcdFeaturesPreferenceFragment extends PreferenceFragment
     @Override
     public void onResume() {
         super.onResume();
-        mHbmPref.setChecked(SystemProperties.get(HBM_PROP, "0") != "0");
-        mCabcPref.setValue(SystemProperties.get(CABC_PROP, "0"));
-        mCabcPref.setSummary(mCabcPref.getEntry());
+        restorePreferenceState();
         validateKernelSupport();
     }
 
@@ -89,6 +88,14 @@ public class LcdFeaturesPreferenceFragment extends PreferenceFragment
         return true;
     }
 
+    private void restorePreferenceState() {
+        boolean isHbmEnabled = SystemProperties.getInt(HBM_PROP, HBM_MODE_OFF) > HBM_MODE_OFF;
+        String activeCabc = SystemProperties.get(CABC_PROP, "0");
+        mHbmPref.setChecked(isHbmEnabled);
+        mCabcPref.setValue(activeCabc);
+        mCabcPref.setSummary(mCabcPref.getEntry());
+    }
+
     private void validateKernelSupport() {
         if (!FileUtils.fileExists(HBM_NODE)) {
             mHbmPref.setSummary(getResources().getString(R.string.kernel_not_supported));