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

Commit 66b573ad authored by Fan Zhang's avatar Fan Zhang
Browse files

Add display settings dashboard to new IA. 

- Added a activity-alias pointing to displaySettings as top level
  setting item.
- Refactored all preference logic in DisplaySettings into
  PreferenceControllers. During fragment onAttach it installs all
  controllers, and during onResume it updates preference state. Each
  controller listens to its own preference change event.

Bug: 31800242
Test: RunSettingsRoboTests
Change-Id: Ibc9bf200c5acce7c4ae9292340822afee27a3a28
parent 36a6cb03

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -3044,6 +3044,19 @@ 
                       android:value="com.android.settings.category.ia.homepage"/>

        </activity-alias>



        <activity-alias android:name="DisplayDashboardAlias"

                        android:targetActivity="Settings$DisplaySettingsActivity">

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

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

            </intent-filter>

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

        </activity-alias>



        <activity android:name=".Settings$StorageDashboardActivity"

                  android:label="@string/storage_settings"

                  android:icon="@drawable/ic_settings_storage">

src/com/android/settings/DeviceInfoSettings.java

+7 −5
Original line number Diff line number Diff line
@@ -35,10 +35,9 @@ import android.util.Log; 
import android.widget.Toast;



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

import com.android.settings.dashboard.DashboardFeatureProvider;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;

import com.android.settings.deviceinfo.SystemUpdatePreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Index;

import com.android.settings.search.Indexable;
@@ -77,7 +76,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
    int mDevHitCountdown;

    Toast mDevHitToast;

    private SystemUpdatePreferenceController mSystemUpdatePreferenceController;

    private DashboardFeatureProvider mDashboardFeatureProvider;

    private AdditionalSystemUpdatePreferenceController mAdditionalSystemUpdatePreferenceController;



    private UserManager mUm;
@@ -102,8 +101,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        final Activity activity = getActivity();

        mUm = UserManager.get(activity);

        mSystemUpdatePreferenceController = new SystemUpdatePreferenceController(activity, mUm);

        mDashboardFeatureProvider = FeatureFactory.getFactory(activity)

                .getDashboardFeatureProvider(activity);

        mAdditionalSystemUpdatePreferenceController =

                new AdditionalSystemUpdatePreferenceController(activity);



        addPreferencesFromResource(R.xml.device_info_settings);
@@ -159,6 +158,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
         * info.

         */

        mSystemUpdatePreferenceController.displayPreference(getPreferenceScreen());

        mAdditionalSystemUpdatePreferenceController.displayPreference(getPreferenceScreen());



        // Remove manual entry if none present.

        removePreferenceIfBoolFalse(KEY_MANUAL, R.bool.config_show_manual);
@@ -398,6 +398,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
                }

                new SystemUpdatePreferenceController(context, UserManager.get(context))

                        .updateNonIndexableKeys(keys);

                new AdditionalSystemUpdatePreferenceController(context)

                        .updateNonIndexableKeys(keys);

                return keys;

            }

src/com/android/settings/DisplaySettings.java

+60 −446

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ public class Settings extends SettingsActivity { 
    public static class SystemSettings extends SettingsActivity { /* empty */ }



    // Top level categories for new IA

    public static class DisplayDashboardActivity extends SettingsActivity {}

    public static class StorageDashboardActivity extends SettingsActivity {}

    public static class SystemDashboardActivity extends SettingsActivity {}

    public static class SupportDashboardActivity extends SettingsActivity {}

src/com/android/settings/SettingsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ public class SettingsActivity extends SettingsDrawerActivity 
            // New IA

            // Home page

            "com.android.settings.Settings.BatteryDashboardAlias",

            "com.android.settings.Settings.DisplayDashboardAlias",

            Settings.SystemDashboardActivity.class.getName(),

            Settings.SupportDashboardActivity.class.getName(),

            // Home page > System