Snap for 4810559 from cf2e1fd5936aae877615e2061908151ea1530596 to pi-release (ecdc5641) · Commits · e / os / android_packages_apps_Settings

res/raw/gesture_swipe_up.mp4

+917 B (377 KiB)

File changed.

No diff preview for this file type.

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

+5 −7

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package com.android.settings.applications;

		import android.content.Context;

		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		import com.android.settingslib.applications.ApplicationsState.AppFilter;
		@@ -28,10 +30,11 @@ import java.util.ArrayList;
		*/
		public class AppStatePowerBridge extends AppStateBaseBridge {

		private final PowerWhitelistBackend mBackend = PowerWhitelistBackend.getInstance();
		private final PowerWhitelistBackend mBackend;

		public AppStatePowerBridge(ApplicationsState appState, Callback callback) {
		public AppStatePowerBridge(Context context, ApplicationsState appState, Callback callback) {
		super(appState, callback);
		mBackend = PowerWhitelistBackend.getInstance(context);
		}

		@Override
		@@ -50,11 +53,6 @@ public class AppStatePowerBridge extends AppStateBaseBridge {
		app.extraInfo = mBackend.isWhitelisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
		}

		public static class HighPowerState {
		public boolean isHighPower;
		public boolean isSystemHighPower;
		}

		public static final AppFilter FILTER_POWER_WHITELISTED = new CompoundFilter(
		ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED, new AppFilter() {
		@Override

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

+16 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.settings.applications;

		import android.app.admin.DevicePolicyManager;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ComponentInfo;
		@@ -26,8 +27,11 @@ import android.content.pm.ResolveInfo;
		import android.content.pm.UserInfo;
		import android.os.RemoteException;
		import android.os.UserManager;
		import android.telecom.DefaultDialerManager;
		import android.text.TextUtils;
		import android.util.ArraySet;

		import com.android.internal.telephony.SmsApplication;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		import java.util.ArrayList;
		@@ -124,7 +128,18 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide

		@Override
		public Set<String> getKeepEnabledPackages() {
		return new ArraySet<>();
		// Find current default phone/sms app. We should keep them enabled.
		final Set<String> keepEnabledPackages = new ArraySet<>();
		final String defaultDialer = DefaultDialerManager.getDefaultDialerApplication(mContext);
		if (!TextUtils.isEmpty(defaultDialer)) {
		keepEnabledPackages.add(defaultDialer);
		}
		final ComponentName defaultSms = SmsApplication.getDefaultSmsApplication(
		mContext, true /* updateIfNeeded */);
		if (defaultSms != null) {
		keepEnabledPackages.add(defaultSms.getPackageName());
		}
		return keepEnabledPackages;
		}

		private static class CurrentUserAndManagedProfilePolicyInstalledAppCounter

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -884,7 +884,7 @@ public class ManageApplications extends InstrumentedFragment
		} else if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
		mExtraInfoBridge = new AppStateUsageBridge(mContext, mState, this);
		} else if (mManageApplications.mListType == LIST_TYPE_HIGH_POWER) {
		mExtraInfoBridge = new AppStatePowerBridge(mState, this);
		mExtraInfoBridge = new AppStatePowerBridge(mContext, mState, this);
		} else if (mManageApplications.mListType == LIST_TYPE_OVERLAY) {
		mExtraInfoBridge = new AppStateOverlayBridge(mContext, mState, this);
		} else if (mManageApplications.mListType == LIST_TYPE_WRITE_SETTINGS) {
		@@ -1276,7 +1276,8 @@ public class ManageApplications extends InstrumentedFragment
		return true;
		}
		ApplicationsState.AppEntry entry = mEntries.get(position);
		return !PowerWhitelistBackend.getInstance().isSysWhitelisted(entry.info.packageName);
		return !PowerWhitelistBackend.getInstance(mContext)
		.isSysWhitelisted(entry.info.packageName);
		}

		@Override

src/com/android/settings/bluetooth/BluetoothSliceBuilder.java

+12 −9

Original line number	Diff line number	Diff line
		@@ -98,6 +98,17 @@ public class BluetoothSliceBuilder {
		.build();
		}

		public static Intent getIntent(Context context) {
		final String screenTitle = context.getText(R.string.bluetooth_settings_title).toString();
		final Uri contentUri = new Uri.Builder().appendPath(
		SettingsSlicesContract.KEY_BLUETOOTH).build();
		return DatabaseIndexingUtils.buildSearchResultPageIntent(context,
		BluetoothDashboardFragment.class.getName(), null /* key */, screenTitle,
		MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY)
		.setClassName(context.getPackageName(), SubSettings.class.getName())
		.setData(contentUri);
		}

		/**
		* Update the current Bluetooth status to the boolean value keyed by
		* {@link android.app.slice.Slice#EXTRA_TOGGLE_STATE} on {@param intent}.
		@@ -119,15 +130,7 @@ public class BluetoothSliceBuilder {
		}

		private static PendingIntent getPrimaryAction(Context context) {
		final String screenTitle = context.getText(R.string.bluetooth_settings_title).toString();
		final Uri contentUri = new Uri.Builder().appendPath(
		SettingsSlicesContract.KEY_BLUETOOTH).build();
		final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(context,
		BluetoothDashboardFragment.class.getName(), null /* key */, screenTitle,
		MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY)
		.setClassName(context.getPackageName(), SubSettings.class.getName())
		.setData(contentUri);

		final Intent intent = getIntent(context);
		return PendingIntent.getActivity(context, 0 /* requestCode */,
		intent, 0 /* flags */);
		}