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

Commit ce55d7c6 authored by Doris Ling's avatar Doris Ling
Browse files

Remove app info page v1 related codes. 

- change to use AppInfoDashboardFragment completely
- remove InstalledAppDetails and the corresponding tests

Change-Id: I8cbdf71cadc8b5743929abbafe91185e5e39b6b2
Fixes: 69384089
Test: make RunSettingsRoboTests
parent 75c2ca96

src/com/android/settings/applications/InstalledAppDetails.java

deleted100755 → 0
+0 −1478

File deleted.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/applications/InstalledAppDetailsTop.java

+2 −11
Original line number Diff line number Diff line
@@ -17,30 +17,21 @@ 
package com.android.settings.applications;



import android.content.Intent;

import android.util.FeatureFlagUtils;



import com.android.settings.SettingsActivity;

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

import com.android.settings.core.FeatureFlags;



public class InstalledAppDetailsTop extends SettingsActivity {



    @Override

    public Intent getIntent() {

        Intent modIntent = new Intent(super.getIntent());

        if (FeatureFlagUtils.isEnabled(this, FeatureFlags.APP_INFO_V2)) {

        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, AppInfoDashboardFragment.class.getName());

        } else {

            modIntent.putExtra(EXTRA_SHOW_FRAGMENT, InstalledAppDetails.class.getName());

        }

        return modIntent;

    }



    @Override

    protected boolean isValidFragment(String fragmentName) {

        if (FeatureFlagUtils.isEnabled(this, FeatureFlags.APP_INFO_V2)) {

        return AppInfoDashboardFragment.class.getName().equals(fragmentName);

    }

        return InstalledAppDetails.class.getName().equals(fragmentName);

    }

}

src/com/android/settings/applications/RecentAppsPreferenceController.java

+4 −13
Original line number Diff line number Diff line
@@ -34,14 +34,12 @@ import android.support.v7.preference.PreferenceScreen; 
import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;

import android.util.IconDrawableFactory;

import android.util.Log;



import com.android.settings.R;

import com.android.settings.Utils;

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

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.widget.AppPreference;

import com.android.settingslib.applications.AppUtils;
@@ -245,17 +243,10 @@ public class RecentAppsPreferenceController extends AbstractPreferenceController 
                    System.currentTimeMillis() - stat.getLastTimeUsed(), false));

            pref.setOrder(i);

            pref.setOnPreferenceClickListener(preference -> {

                if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.APP_INFO_V2)) {

                AppInfoBase.startAppInfoFragment(AppInfoDashboardFragment.class,

                    R.string.application_info_label, pkgName, appEntry.info.uid, mHost,

                    1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY);

                return true;

                } else {

                    AppInfoBase.startAppInfoFragment(InstalledAppDetails.class,

                            R.string.application_info_label, pkgName, appEntry.info.uid, mHost,

                            1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY);

                    return true;

                }

            });

            if (!rebindPref) {

                mCategory.addPreference(pref);

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

+0 −4
Original line number Diff line number Diff line
@@ -45,19 +45,15 @@ import android.util.Log; 
import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.View;



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

import com.android.settings.DeviceAdminAdd;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.applications.LayoutPreference;

import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.widget.EntityHeaderController;

import com.android.settings.widget.PreferenceCategoryController;

import com.android.settings.wrapper.DevicePolicyManagerWrapper;

import com.android.settingslib.RestrictedLockUtils;

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

+6 −12
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.support.v7.widget.LinearLayoutManager; 
import android.support.v7.widget.RecyclerView;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -91,15 +90,14 @@ import com.android.settings.applications.AppStateWriteSettingsBridge; 
import com.android.settings.applications.AppStorageSettings;

import com.android.settings.applications.DefaultAppSettings;

import com.android.settings.applications.InstalledAppCounter;

import com.android.settings.applications.InstalledAppDetails;

import com.android.settings.applications.NotificationApps;

import com.android.settings.applications.DirectoryAccessDetails;

import com.android.settings.applications.UsageAccessDetails;

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

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

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.dashboard.SummaryLoader;

import com.android.settings.fuelgauge.HighPowerDetail;
@@ -151,7 +149,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment 
    private static final String EXTRA_HAS_ENTRIES = "hasEntries";

    private static final String EXTRA_HAS_BRIDGE = "hasBridge";



    // attributes used as keys when passing values to InstalledAppDetails activity

    // attributes used as keys when passing values to AppInfoDashboardFragment activity

    public static final String APP_CHG = "chg";



    // constant value that can be used to check return code from sub activity.
@@ -553,13 +551,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment 
            // process ahead of time, to avoid a long load of data when user clicks on a managed

            // app. Maybe when they load the list of apps that contains managed profile apps.

            default:

                if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.APP_INFO_V2)) {

                startAppInfoFragment(

                    AppInfoDashboardFragment.class, R.string.application_info_label);

                } else {

                    startAppInfoFragment(

                            InstalledAppDetails.class, R.string.application_info_label);

                }

                break;

        }

    }
@@ -1227,7 +1220,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment 
            switch (mManageApplications.mListType) {

                case LIST_TYPE_NOTIFICATION:

                    if (entry.extraInfo != null) {

                        holder.setSummary(InstalledAppDetails.getNotificationSummary(

                        holder.setSummary(

                            AppNotificationPreferenceController.getNotificationSummary(

                                (AppRow) entry.extraInfo, mContext));

                    } else {

                        holder.setSummary(null);