Merge "Remove app info page v1 related codes." (5dda7faa) · Commits · e / os / android_packages_apps_Settings

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

src/com/android/settings/core/FeatureFlags.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ package com.android.settings.core;
		* This class keeps track of all feature flags in Settings.
		*/
		public class FeatureFlags {
		public static final String APP_INFO_V2 = "settings_app_info_v2";
		public static final String CONNECTED_DEVICE_V2 = "settings_connected_device_v2";
		public static final String BATTERY_SETTINGS_V2 = "settings_battery_v2";
		public static final String BATTERY_DISPLAY_APP_LIST = "settings_battery_display_app_list";