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

Commit 60e10878 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update pref fragment for "see all" in app & notification" into pi-dev

parents 95d0b959 0ced3704

res/xml/app_and_notification.xml

+3 −8
Original line number Original line Diff line number Diff line
@@ -32,13 +32,8 @@ 
        <Preference

        <Preference

            android:title="@string/applications_settings"

            android:title="@string/applications_settings"

            android:key="all_app_info"

            android:key="all_app_info"

            android:order="20">

            android:fragment="com.android.settings.applications.manageapplications.ManageApplications"

            <intent

            android:order="20" />

                android:action="android.intent.action.MAIN"

                android:targetPackage="com.android.settings"

                android:targetClass="com.android.settings.Settings$ManageApplicationsActivity">

            </intent>

        </Preference>

    </PreferenceCategory>

    </PreferenceCategory>





    <!-- Empty category to draw divider -->

    <!-- Empty category to draw divider -->

src/com/android/settings/applications/manageapplications/ManageApplications.java

+10 −8
Original line number Original line Diff line number Diff line
@@ -96,9 +96,7 @@ import com.android.settings.applications.appinfo.AppNotificationPreferenceContro 
import com.android.settings.applications.appinfo.DrawOverlayDetails;

import com.android.settings.applications.appinfo.DrawOverlayDetails;

import com.android.settings.applications.appinfo.ExternalSourcesDetails;

import com.android.settings.applications.appinfo.ExternalSourcesDetails;

import com.android.settings.applications.appinfo.WriteSettingsDetails;

import com.android.settings.applications.appinfo.WriteSettingsDetails;



import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.fuelgauge.HighPowerDetail;

import com.android.settings.fuelgauge.HighPowerDetail;
@@ -132,7 +130,7 @@ import java.util.Set; 
 * can be launched through Settings or via the ACTION_MANAGE_PACKAGE_STORAGE

 * can be launched through Settings or via the ACTION_MANAGE_PACKAGE_STORAGE

 * intent.

 * intent.

 */

 */

public class ManageApplications extends InstrumentedPreferenceFragment

public class ManageApplications extends InstrumentedFragment

        implements View.OnClickListener, OnItemSelectedListener {

        implements View.OnClickListener, OnItemSelectedListener {





    static final String TAG = "ManageApplications";

    static final String TAG = "ManageApplications";
@@ -286,6 +284,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment 
            mListType = LIST_TYPE_WIFI_ACCESS;

            mListType = LIST_TYPE_WIFI_ACCESS;

            screenTitle = R.string.change_wifi_state_title;

            screenTitle = R.string.change_wifi_state_title;

        } else {

        } else {

            if (screenTitle == -1) {

                screenTitle = R.string.application_info_label;

            }

            mListType = LIST_TYPE_MAIN;

            mListType = LIST_TYPE_MAIN;

        }

        }

        final AppFilterRegistry appFilterRegistry = AppFilterRegistry.getInstance();

        final AppFilterRegistry appFilterRegistry = AppFilterRegistry.getInstance();
@@ -551,7 +552,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment 
                startAppInfoFragment(DirectoryAccessDetails.class, R.string.directory_access);

                startAppInfoFragment(DirectoryAccessDetails.class, R.string.directory_access);

                break;

                break;

            case LIST_TYPE_WIFI_ACCESS:

            case LIST_TYPE_WIFI_ACCESS:

                startAppInfoFragment(ChangeWifiStateDetails.class, R.string.change_wifi_state_title);

                startAppInfoFragment(ChangeWifiStateDetails.class,

                        R.string.change_wifi_state_title);

                break;

                break;

            // TODO: Figure out if there is a way where we can spin up the profile's settings

            // TODO: Figure out if there is a way where we can spin up the profile's settings

            // process ahead of time, to avoid a long load of data when user clicks on a managed

            // process ahead of time, to avoid a long load of data when user clicks on a managed