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

Commit ea68f2c4 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

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

am: 60e10878

Change-Id: I5e8a4c9aa1676343d61cfd65817372d2dca32ee1
parents 94de70eb 60e10878

res/xml/app_and_notification.xml

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

            android:title="@string/applications_settings"

            android:key="all_app_info"

            android:order="20">

            <intent

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

                android:targetPackage="com.android.settings"

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

            </intent>

        </Preference>

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

            android:order="20" />

    </PreferenceCategory>



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

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

+10 −8
Original line number 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.ExternalSourcesDetails;

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



import com.android.settings.core.FeatureFlags;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.dashboard.SummaryLoader;

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

 * intent.

 */

public class ManageApplications extends InstrumentedPreferenceFragment

public class ManageApplications extends InstrumentedFragment

        implements View.OnClickListener, OnItemSelectedListener {



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

            screenTitle = R.string.change_wifi_state_title;

        } else {

            if (screenTitle == -1) {

                screenTitle = R.string.application_info_label;

            }

            mListType = LIST_TYPE_MAIN;

        }

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

                break;

            case LIST_TYPE_WIFI_ACCESS:

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

                startAppInfoFragment(ChangeWifiStateDetails.class,

                        R.string.change_wifi_state_title);

                break;

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