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

Merge "[Reduce Bright Colors] reorder preferences" into sc-dev am: 18923596c4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic68068d76c144c2a622b03aac056a90a42db0140
This commit is contained in:
Sally Yuen
2021-03-02 18:38:50 +00:00
committed by Automerger Merge Worker
parent 845a518a04 18923596c4
commit d10678e2bf
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
View File

@@ -29,9 +29,13 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.preference.PreferenceCategory;
import androidx.preference.SwitchPreference;
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SeekBarPreference;
import com.android.settings.widget.SettingsMainSwitchPreference;
import com.android.settingslib.search.SearchIndexable;
@@ -75,7 +79,21 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
}
};
return super.onCreateView(inflater, container, savedInstanceState);
final View view = super.onCreateView(inflater, container, savedInstanceState);
updateGeneralCategoryOrder();
return view;
}
private void updateGeneralCategoryOrder() {
final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
final SeekBarPreference intensity = findPreference(KEY_INTENSITY);
getPreferenceScreen().removePreference(intensity);
intensity.setOrder(mShortcutPreference.getOrder() - 2);
generalCategory.addPreference(intensity);
final SwitchPreference persist = findPreference(KEY_PERSIST);
getPreferenceScreen().removePreference(persist);
persist.setOrder(mShortcutPreference.getOrder() - 1);
generalCategory.addPreference(persist);
}
@Override
@@ -83,17 +101,6 @@ public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePre
super.onViewCreated(view, savedInstanceState);
}
/** Customizes the order by preference key. */
protected List<String> getPreferenceOrderList() {
final List<String> lists = new ArrayList<>();
lists.add(KEY_USE_SERVICE_PREFERENCE);
lists.add(KEY_INTENSITY);
lists.add(KEY_GENERAL_CATEGORY);
lists.add(KEY_PERSIST);
lists.add(KEY_INTRODUCTION_CATEGORY);
return lists;
}
@Override
public void onResume() {
super.onResume();