PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dream settings categories, to fix padding.

Browse Source 
The extra PreferenceCategory is adding some unnecessary padding, so
removing it. Instead of using a preference category to enable/disable
all items, we just iterate through all the preferences when
enabling/disabling items.

Bug: 227139218
Test: locally on device
Change-Id: I403295fbccb7b135b7d603cd1fc713c4c0189569
This commit is contained in:
Lucas Silva
2022-04-14 14:56:51 -04:00
parent a5a1c5710e
commit d8b90650d3
3 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/dream/DreamSettings.java
View File

@@ -32,7 +32,7 @@ import android.widget.Button;
import android.widget.Switch;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R;
@@ -57,10 +57,7 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
static final String EITHER_CHARGING_OR_DOCKED = "either_charging_or_docked";
static final String NEVER_DREAM = "never";
private static final String MAIN_PREF_CATEGORY = "dream_main_category";
private MainSwitchPreference mMainSwitchPreference;
private PreferenceCategory mMainPrefCategory;
private Button mPreviewButton;
private RecyclerView mRecyclerView;
@@ -152,6 +149,22 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
return controllers;
}
private void setAllPreferencesEnabled(boolean isEnabled) {
getPreferenceControllers().forEach(controllers -> {
controllers.forEach(controller -> {
final String prefKey = controller.getPreferenceKey();
if (prefKey.equals(MAIN_SWITCH_PREF_KEY)) {
return;
}
final Preference pref = findPreference(prefKey);
if (pref != null) {
pref.setEnabled(isEnabled);
controller.updateState(pref);
}
});
});
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -163,10 +176,7 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
mMainSwitchPreference.addOnSwitchChangeListener(this);
}
mMainPrefCategory = findPreference(MAIN_PREF_CATEGORY);
if (mMainPrefCategory != null) {
mMainPrefCategory.setEnabled(dreamBackend.isEnabled());
}
setAllPreferencesEnabled(dreamBackend.isEnabled());
}
@Override
@@ -194,7 +204,7 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
mMainPrefCategory.setEnabled(isChecked);
setAllPreferencesEnabled(isChecked);
mPreviewButton.setVisibility(isChecked ? View.VISIBLE : View.GONE);
updatePaddingForPreviewButton();
}