From be4c5f078fa1e1c367e722ccba61271dd0200014 Mon Sep 17 00:00:00 2001 From: Yanting Yang Date: Fri, 7 May 2021 00:07:26 +0800 Subject: [PATCH] Remove silky flag from homepage for official release Remove the silky condition and clean up redundant files. Bug: 183670633 Test: robotests & visual with turning on/off silky home Change-Id: I9259108534935ed8551748b922098dd52043afc1 --- res/xml/top_level_settings.xml | 179 ++++++++++-------- res/xml/top_level_settings_grouped.xml | 177 ----------------- .../DashboardFeatureProviderImpl.java | 5 +- .../homepage/SettingsHomepageActivity.java | 7 +- .../settings/homepage/TopLevelSettings.java | 23 +-- .../homepage/TopLevelSettingsTest.java | 15 -- 6 files changed, 101 insertions(+), 305 deletions(-) delete mode 100644 res/xml/top_level_settings_grouped.xml diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 725390e1404..6d73ad6654f 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -21,140 +21,157 @@ android:key="top_level_settings"> + android:fragment="com.android.settings.applications.AppDashboardFragment" + android:icon="@drawable/ic_apps" + android:key="top_level_apps" + android:order="-130" + android:title="@string/apps_dashboard_title" + android:summary="@string/app_and_notification_dashboard_summary"/> + + - - - - + android:fragment="com.android.settings.notification.SoundSettings" + android:icon="@drawable/ic_volume_up_24dp" + android:key="top_level_sound" + android:order="-90" + android:title="@string/sound_settings" + android:summary="@string/sound_dashboard_summary"/> + android:fragment="com.android.settings.DisplaySettings" + android:icon="@drawable/ic_settings_display_white" + android:key="top_level_display" + android:order="-80" + android:title="@string/display_settings" + android:summary="@string/display_dashboard_summary" + settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/> + + + + + android:fragment="com.android.settings.privacy.PrivacyDashboardFragment" + android:icon="@drawable/ic_settings_privacy" + android:key="top_level_privacy" + android:order="-40" + android:title="@string/privacy_dashboard_title" + android:summary="@string/privacy_dashboard_summary"/> + android:fragment="com.android.settings.location.LocationSettings" + android:icon="@drawable/ic_settings_location" + android:key="top_level_location" + android:order="-30" + android:title="@string/location_settings_title" + android:summary="@string/location_settings_loading_app_permission_stats" + settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/> + android:fragment="com.android.settings.accounts.AccountDashboardFragment" + android:icon="@drawable/ic_settings_accounts" + android:key="top_level_accounts" + android:order="-10" + android:title="@string/account_dashboard_title" + android:summary="@string/summary_placeholder" + settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/> + + diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml deleted file mode 100644 index 7b4f8a10773..00000000000 --- a/res/xml/top_level_settings_grouped.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index 5a686c26a06..0de86f5b668 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -47,7 +47,6 @@ import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; import android.util.ArrayMap; -import android.util.FeatureFlagUtils; import android.util.Log; import android.util.Pair; import android.widget.Toast; @@ -60,7 +59,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; -import com.android.settings.core.FeatureFlags; import com.android.settings.dashboard.profileselector.ProfileSelectDialog; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.PrimarySwitchPreference; @@ -399,8 +397,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { private void setPreferenceIcon(Preference preference, Tile tile, boolean forceRoundedIcon, String iconPackage, Icon icon) { Drawable iconDrawable = icon.loadDrawable(preference.getContext()); - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME) - && TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) { + if (TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) { iconDrawable.setTint(Utils.getHomepageIconColor(preference.getContext())); } else if (forceRoundedIcon && !TextUtils.equals(mContext.getPackageName(), iconPackage)) { iconDrawable = new AdaptiveIcon(mContext, iconDrawable, diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index c59b805c437..5950e4b8ba1 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -96,12 +96,7 @@ public class SettingsHomepageActivity extends FragmentActivity { getLifecycle().addObserver(new AvatarViewMixin(this, avatarView)); } - if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)) { - showSuggestionFragment(); - } else { - findViewById(R.id.homepage_title).setVisibility(View.GONE); - avatarView.setVisibility(View.GONE); - } + showSuggestionFragment(); if (FeatureFlagUtils.isEnabled(this, FeatureFlags.CONTEXTUAL_HOME)) { showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content); diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index f4f7f61cd1d..681ea5111c7 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -23,8 +23,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.provider.SearchIndexableResource; -import android.util.FeatureFlagUtils; import androidx.fragment.app.Fragment; import androidx.preference.Preference; @@ -33,7 +31,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.Utils; -import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -41,9 +38,6 @@ import com.android.settings.support.SupportPreferenceController; import com.android.settingslib.core.instrumentation.Instrumentable; import com.android.settingslib.search.SearchIndexable; -import java.util.Arrays; -import java.util.List; - @SearchIndexable(forTarget = MOBILE) public class TopLevelSettings extends DashboardFragment implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback { @@ -59,9 +53,6 @@ public class TopLevelSettings extends DashboardFragment implements @Override protected int getPreferenceScreenResId() { - if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) { - return R.xml.top_level_settings_grouped; - } return R.xml.top_level_settings; } @@ -108,9 +99,6 @@ public class TopLevelSettings extends DashboardFragment implements @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { super.onCreatePreferences(savedInstanceState, rootKey); - if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) { - return; - } final PreferenceScreen screen = getPreferenceScreen(); if (screen == null) { return; @@ -137,16 +125,7 @@ public class TopLevelSettings extends DashboardFragment implements } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME) - ? R.xml.top_level_settings_grouped : R.xml.top_level_settings; - return Arrays.asList(sir); - } + new BaseSearchIndexProvider(R.xml.top_level_settings) { @Override protected boolean isPageSearchEnabled(Context context) { diff --git a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java index 663d7f72a1a..da2f8b5e566 100644 --- a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java +++ b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java @@ -28,13 +28,11 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.util.FeatureFlagUtils; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; @@ -65,19 +63,6 @@ public class TopLevelSettingsTest { assertThat(mSettings.shouldForceRoundedIcon()).isTrue(); } - @Test - public void getPreferenceScreenResId_silkyHomeDisabled_defaultSettings() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); - assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.top_level_settings); - } - - @Test - public void getPreferenceScreenResId_silkyHomeEnabled_groupedSettings() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - assertThat(mSettings.getPreferenceScreenResId()).isEqualTo( - R.xml.top_level_settings_grouped); - } - @Test public void onCreatePreferences_shouldTintPreferenceIcon() { final Preference preference = new Preference(mContext);