Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 130c4770 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove DashboardSummary and all related classes. 

- Condition is already supported in PersonalSettingsFragment
- Suggestion is already supported in PersonalSettingsFragment
- Static/dynamic tiles are supported in TopLevelSettings

Change-Id: I51882e3bd0919ad95109baefac683d98667c11e3
Fixes: 110405144
Test: robotests
parent 61a8d1fb

AndroidManifest.xml

+1 −83
Original line number Diff line number Diff line
@@ -191,12 +191,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="11"/>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.network.NetworkDashboardFragment"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -213,14 +207,8 @@ 
                <action android:name="android.settings.BLUETOOTH_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="10"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>
@@ -897,18 +885,10 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="7"/>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.DisplaySettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/display_dashboard_summary"/>

        </activity>



        <activity
@@ -1262,12 +1242,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="4"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.security.SecuritySettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1431,18 +1405,10 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="2"/>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.AccessibilitySettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/accessibility_settings_summary" />

        </activity>



        <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
@@ -1772,14 +1738,6 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="5"/>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.title"

                android:resource="@string/storage_usb_settings" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.deviceinfo.StorageSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2171,12 +2129,6 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="8"/>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.fuelgauge.PowerUsageSummary" />

        </activity>
@@ -2545,18 +2497,10 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="6"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.SoundSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/sound_dashboard_summary"/>

        </activity>



        <!-- Show apps for which application-level notification settings are applicable -->
@@ -2954,13 +2898,8 @@ 
            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="9"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.AppAndNotificationDashboardFragment"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/app_and_notification_dashboard_summary"/>

        </activity>



        <activity
@@ -2969,9 +2908,6 @@ 
            android:icon="@drawable/ic_homepage_accounts"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.settings.SYNC_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -2980,11 +2916,8 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="3"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.accounts.AccountDashboardFragment"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>
@@ -2995,20 +2928,12 @@ 
            android:icon="@drawable/ic_homepage_system_dashboard"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <intent-filter android:priority="70">

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="-1"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.system.SystemDashboardFragment"/>

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/system_dashboard_summary"/>

        </activity>



        <activity android:name=".support.SupportDashboardActivity"
@@ -3016,18 +2941,10 @@ 
                  android:icon="@drawable/ic_homepage_support"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Panel"

                  android:enabled="@bool/config_support_enabled">

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SUPPORT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="-2"/>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage"/>

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/support_summary"/>

        </activity>



        <service
@@ -3076,6 +2993,7 @@ 
                <action android:name="android.service.quicksettings.action.QS_TILE" />

            </intent-filter>

        </service>



        <service

            android:name=".development.qstile.DevelopmentTiles$WinscopeTrace"

            android:label="@string/winscope_trace_quick_settings_title"

src/com/android/settings/SettingsActivity.java

+2 −9
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ import com.android.settings.core.SettingsBaseActivity; 
import com.android.settings.core.SubSettingLauncher;

import com.android.settings.core.gateway.SettingsGateway;

import com.android.settings.dashboard.DashboardFeatureProvider;

import com.android.settings.dashboard.DashboardSummary;

import com.android.settings.homepage.SettingsHomepageActivity;

import com.android.settings.homepage.TopLevelSettings;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.wfd.WifiDisplaySettings;
@@ -393,14 +391,9 @@ public class SettingsActivity extends SettingsBaseActivity 
        } else {

            // Show search icon as up affordance if we are displaying the main Dashboard

            mInitialTitleResId = R.string.dashboard_title;



            if (SettingsHomepageActivity.isDynamicHomepageEnabled(this)) {

            switchToFragment(TopLevelSettings.class.getName(), null /* args */, false, false,

                    mInitialTitleResId, mInitialTitle, false);

            } else {

                switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,

                        mInitialTitleResId, mInitialTitle, false);

            }



        }

    }

src/com/android/settings/accounts/AccountDashboardFragment.java

+0 −49
Original line number Diff line number Diff line
@@ -18,22 +18,16 @@ package com.android.settings.accounts; 
import static android.provider.Settings.EXTRA_AUTHORITIES;



import android.content.Context;

import android.icu.text.ListFormatter;

import android.os.UserHandle;

import android.provider.SearchIndexableResource;

import android.text.BidiFormatter;

import android.text.TextUtils;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.users.AutoSyncDataPreferenceController;

import com.android.settings.users.AutoSyncPersonalDataPreferenceController;

import com.android.settings.users.AutoSyncWorkDataPreferenceController;

import com.android.settingslib.accounts.AuthenticatorHelper;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.search.SearchIndexable;
@@ -89,49 +83,6 @@ public class AccountDashboardFragment extends DashboardFragment { 
        return controllers;

    }



    private static class SummaryProvider implements SummaryLoader.SummaryProvider {



        private final Context mContext;

        private final SummaryLoader mSummaryLoader;



        public SummaryProvider(Context context, SummaryLoader summaryLoader) {

            mContext = context;

            mSummaryLoader = summaryLoader;

        }



        @Override

        public void setListening(boolean listening) {

            if (listening) {

                final AuthenticatorHelper authHelper = new AuthenticatorHelper(mContext,

                        UserHandle.of(UserHandle.myUserId()), null /* OnAccountsUpdateListener */);

                final String[] types = authHelper.getEnabledAccountTypes();

                final BidiFormatter bidiFormatter = BidiFormatter.getInstance();

                final List<CharSequence> summaries = new ArrayList<>();



                if (types == null || types.length == 0) {

                    summaries.add(mContext.getString(R.string.account_dashboard_default_summary));

                } else {

                    // Show up to 3 account types, ignore any null value

                    int accountToAdd = Math.min(3, types.length);



                    for (int i = 0; i < types.length && accountToAdd > 0; i++) {

                        final CharSequence label = authHelper.getLabelForType(mContext, types[i]);

                        if (TextUtils.isEmpty(label)) {

                            continue;

                        }



                        summaries.add(bidiFormatter.unicodeWrap(label));

                        accountToAdd--;

                    }

                }

                mSummaryLoader.setSummary(this, ListFormatter.getInstance().format(summaries));

            }

        }

    }



    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY

            = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+0 −31
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.settings.connecteddevice;



import android.app.Activity;

import android.content.Context;

import android.provider.SearchIndexableResource;
@@ -24,7 +23,6 @@ import androidx.annotation.VisibleForTesting; 
import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -92,35 +90,6 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
        use(DiscoverableFooterPreferenceController.class).init(this);

    }



    @VisibleForTesting

    static class SummaryProvider implements SummaryLoader.SummaryProvider {



        private final Context mContext;

        private final SummaryLoader mSummaryLoader;



        public SummaryProvider(Context context, SummaryLoader summaryLoader) {

            mContext = context;

            mSummaryLoader = summaryLoader;

        }



        @Override

        public void setListening(boolean listening) {

            if (listening) {

                mSummaryLoader.setSummary(this, mContext.getText(AdvancedConnectedDeviceController.

                        getConnectedDevicesSummaryResourceId(mContext)));

            }

        }

    }



    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY

            = new SummaryLoader.SummaryProviderFactory() {

        @Override

        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,

                SummaryLoader summaryLoader) {

            return new SummaryProvider(activity, summaryLoader);

        }

    };



    /**

     * For Search.

     */

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

deleted100644 → 0
+0 −407

File deleted.

Preview size limit exceeded, changes collapsed.