Move the additional settings to the top of AppInfoDashboard

Based on the Android S design, move additional settings preference
above the Notifications preference and use SpacePreference to draw
the horizontal divider below AppButtonsPreference since the additional
settings preference is only visible by condition.

Also remove initialExpandedChildrenCount to expose all preferences.

Bug: 174964524
Test: robotest & visual with turning on/off silky home
Change-Id: Ife1d37820e44f8e12af4ed37ed66a29281366b50
This commit is contained in:
Yanting Yang
2021-01-29 01:40:08 +08:00
parent ba8f1ad06f
commit a599dbcc84
2 changed files with 196 additions and 0 deletions

View File

@@ -35,6 +35,7 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
@@ -48,6 +49,7 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsPreferenceController;
import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -245,6 +247,9 @@ public class AppInfoDashboardFragment extends DashboardFragment
@Override
protected int getPreferenceScreenResId() {
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
return R.xml.app_info_settings_v2;
}
return R.xml.app_info_settings;
}