Merge "Remove silky flag from homepage for official release" into sc-dev (89cd044b) · Commits · e / os / android_packages_apps_Settings

res/xml/top_level_settings.xml

+90 −73

Original line number	Diff line number	Diff line
		@@ -21,140 +21,157 @@
		android:key="top_level_settings">

		<Preference
		android:fragment="com.android.settings.network.NetworkDashboardFragment"
		android:icon="@drawable/ic_settings_wireless"
		android:key="top_level_network"
		android:order="-150"
		android:title="@string/network_dashboard_title"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_homepage_network"
		android:order="-120"
		android:fragment="com.android.settings.network.NetworkDashboardFragment"
		settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
		android:icon="@drawable/ic_devices_other"
		android:key="top_level_connected_devices"
		android:order="-140"
		android:title="@string/connected_devices_dashboard_title"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_homepage_connected_device"
		android:order="-110"
		android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
		settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>

		<Preference
		android:key="top_level_apps_and_notifs"
		android:title="@string/app_and_notification_dashboard_title"
		android:summary="@string/app_and_notification_dashboard_summary"
		android:icon="@drawable/ic_homepage_apps"
		android:order="-100"
		android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
		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"/>

		<Preference
		android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
		android:icon="@drawable/ic_notifications"
		android:key="top_level_notification"
		android:order="-120"
		android:title="@string/configure_notification_settings"
		android:summary="@string/notification_dashboard_summary"/>

		<Preference
		android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
		android:icon="@drawable/ic_settings_battery_white"
		android:key="top_level_battery"
		android:order="-110"
		android:title="@string/power_usage_summary_title"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_homepage_battery"
		android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
		android:order="-90"
		settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>

		<Preference
		android:key="top_level_display"
		android:title="@string/display_settings"
		android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
		android:icon="@drawable/ic_storage_white"
		android:key="top_level_storage"
		android:order="-100"
		android:title="@string/storage_settings"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_homepage_display"
		android:order="-80"
		android:fragment="com.android.settings.DisplaySettings"
		settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
		settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>

		<Preference
		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:icon="@drawable/ic_homepage_sound"
		android:summary="@string/sound_dashboard_summary"/>

		<Preference
		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"/>

		<com.android.settingslib.RestrictedTopLevelPreference
		android:icon="@drawable/ic_settings_wallpaper_white"
		android:key="top_level_wallpaper"
		android:order="-70"
		android:fragment="com.android.settings.notification.SoundSettings"/>
		android:title="@string/wallpaper_settings_title"
		android:summary="@string/wallpaper_dashboard_summary"
		settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>

		<Preference
		android:key="top_level_storage"
		android:title="@string/storage_settings"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_homepage_storage"
		android:fragment="com.android.settings.accessibility.AccessibilitySettings"
		android:icon="@drawable/ic_settings_accessibility"
		android:key="top_level_accessibility"
		android:order="-60"
		android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
		settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
		android:title="@string/accessibility_settings"
		android:summary="@string/accessibility_settings_summary"
		settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.security.SecuritySettings"
		android:icon="@drawable/ic_settings_security_white"
		android:key="top_level_security"
		android:order="-50"
		android:title="@string/security_settings_title"
		android:summary="@string/security_dashboard_summary"
		settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>

		<Preference
		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:icon="@drawable/ic_homepage_privacy"
		android:order="-55"
		android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"/>
		android:summary="@string/privacy_dashboard_summary"/>

		<Preference
		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"
		android:icon="@drawable/ic_homepage_location"
		android:order="-50"
		android:fragment="com.android.settings.location.LocationSettings"
		settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>

		<Preference
		android:key="top_level_security"
		android:title="@string/security_settings_title"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_homepage_security"
		android:order="-40"
		android:fragment="com.android.settings.security.SecuritySettings"
		settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
		android:key="top_level_emergency"
		android:title="@string/emergency_settings_preference_title"
		android:summary="@string/emergency_dashboard_summary"
		android:icon="@drawable/ic_settings_emergency"
		android:order="-20"
		android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>

		<Preference
		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"
		android:icon="@drawable/ic_homepage_accounts"
		android:order="-30"
		android:fragment="com.android.settings.accounts.AccountDashboardFragment"
		settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>

		<Preference
		android:key="top_level_accessibility"
		android:title="@string/accessibility_settings"
		android:summary="@string/accessibility_settings_summary"
		android:icon="@drawable/ic_homepage_accessibility"
		android:order="-20"
		android:fragment="com.android.settings.accessibility.AccessibilitySettings"
		settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>

		<Preference
		android:key="top_level_emergency"
		android:title="@string/emergency_settings_preference_title"
		android:icon="@drawable/ic_homepage_emergency"
		android:order="-10"
		android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>

		<Preference
		android:fragment="com.android.settings.system.SystemDashboardFragment"
		android:icon="@drawable/ic_settings_system_dashboard_white"
		android:key="top_level_system"
		android:title="@string/header_category_system"
		android:summary="@string/system_dashboard_summary"
		android:icon="@drawable/ic_homepage_system_dashboard"
		android:order="10"
		android:fragment="com.android.settings.system.SystemDashboardFragment"/>
		android:title="@string/header_category_system"
		android:summary="@string/system_dashboard_summary"/>

		<Preference
		android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
		android:icon="@drawable/ic_phone_info"
		android:key="top_level_about_device"
		android:order="20"
		android:title="@string/about_settings"
		android:summary="@string/summary_placeholder"
		android:icon="@drawable/ic_homepage_about"
		android:order="20"
		android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
		settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>

		<Preference
		android:icon="@drawable/ic_help"
		android:key="top_level_support"
		android:summary="@string/support_summary"
		android:title="@string/page_tab_title_support"
		android:icon="@drawable/ic_homepage_support"
		android:order="100"
		android:title="@string/page_tab_title_support"
		android:summary="@string/support_summary"
		settings:controller="com.android.settings.support.SupportPreferenceController"/>

		</PreferenceScreen>

res/xml/top_level_settings_grouped.xml

deleted100644 → 0

+0 −177

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2020 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="top_level_settings_grouped">

		<Preference
		android:fragment="com.android.settings.network.NetworkDashboardFragment"
		android:icon="@drawable/ic_settings_wireless"
		android:key="top_level_network"
		android:order="-150"
		android:title="@string/network_dashboard_title"
		android:summary="@string/summary_placeholder"
		settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
		android:icon="@drawable/ic_devices_other"
		android:key="top_level_connected_devices"
		android:order="-140"
		android:title="@string/connected_devices_dashboard_title"
		android:summary="@string/summary_placeholder"
		settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>

		<Preference
		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"/>

		<Preference
		android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
		android:icon="@drawable/ic_notifications"
		android:key="top_level_notification"
		android:order="-120"
		android:title="@string/configure_notification_settings"
		android:summary="@string/notification_dashboard_summary"/>

		<Preference
		android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
		android:icon="@drawable/ic_settings_battery_white"
		android:key="top_level_battery"
		android:order="-110"
		android:title="@string/power_usage_summary_title"
		android:summary="@string/summary_placeholder"
		settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
		android:icon="@drawable/ic_storage_white"
		android:key="top_level_storage"
		android:order="-100"
		android:title="@string/storage_settings"
		android:summary="@string/summary_placeholder"
		settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>

		<Preference
		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"/>

		<Preference
		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"/>

		<com.android.settingslib.RestrictedTopLevelPreference
		android:icon="@drawable/ic_settings_wallpaper_white"
		android:key="top_level_wallpaper"
		android:order="-70"
		android:title="@string/wallpaper_settings_title"
		android:summary="@string/wallpaper_dashboard_summary"
		settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.accessibility.AccessibilitySettings"
		android:icon="@drawable/ic_settings_accessibility"
		android:key="top_level_accessibility"
		android:order="-60"
		android:title="@string/accessibility_settings"
		android:summary="@string/accessibility_settings_summary"
		settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.security.SecuritySettings"
		android:icon="@drawable/ic_settings_security_white"
		android:key="top_level_security"
		android:order="-50"
		android:title="@string/security_settings_title"
		android:summary="@string/security_dashboard_summary"
		settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>

		<Preference
		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"/>

		<Preference
		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"/>

		<Preference
		android:key="top_level_emergency"
		android:title="@string/emergency_settings_preference_title"
		android:summary="@string/emergency_dashboard_summary"
		android:icon="@drawable/ic_settings_emergency"
		android:order="-20"
		android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>

		<Preference
		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"/>

		<Preference
		android:fragment="com.android.settings.system.SystemDashboardFragment"
		android:icon="@drawable/ic_settings_system_dashboard_white"
		android:key="top_level_system"
		android:order="10"
		android:title="@string/header_category_system"
		android:summary="@string/system_dashboard_summary"/>

		<Preference
		android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
		android:icon="@drawable/ic_phone_info"
		android:key="top_level_about_device"
		android:order="20"
		android:title="@string/about_settings"
		android:summary="@string/summary_placeholder"
		settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>

		<Preference
		android:icon="@drawable/ic_help"
		android:key="top_level_support"
		android:order="100"
		android:title="@string/page_tab_title_support"
		android:summary="@string/support_summary"
		settings:controller="com.android.settings.support.SupportPreferenceController"/>

		</PreferenceScreen>

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -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,

src/com/android/settings/homepage/SettingsHomepageActivity.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -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);
		}

		if (FeatureFlagUtils.isEnabled(this, FeatureFlags.CONTEXTUAL_HOME)) {
		showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);

src/com/android/settings/homepage/TopLevelSettings.java

+1 −22

Original line number	Diff line number	Diff line
		@@ -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<SearchIndexableResource> 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) {