release-request-957cd691-fb71-4770-8ff7-a3b9602655a5-for-git_oc-mr1-release-43... (9f0f34c1) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_settings_accessibility.xml

+1 −6

Original line number	Diff line number	Diff line
		@@ -21,10 +21,5 @@
		android:tint="?android:attr/colorControlNormal">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M3 10v4c0 .55 .45 1 1 1h3l3.29 3.29c.63 .63 1.71 .18
		1.71-.71V6.41c0-.89-1.08-1.34-1.71-.71L7 9H4c-.55 0-1 .45-1 1zm13.5 2A4.5 4.5 0
		0 0 14 7.97v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 4.46v.19c0 .38 .25 .71 .61
		.85C17.18 6.54 19 9.06 19 12s-1.82 5.46-4.39 6.5c-.36 .14 -.61 .47 -.61 .85
		v.19c0 .63 .63 1.08 1.22 .86 a8.995 8.995 0 0 0 0-16.8c-.59-.23-1.22 .23 -1.22
		.86 z"/>
		android:pathData="M20.75,6.99c-0.14,-0.55 -0.69,-0.87 -1.24,-0.75C17.13,6.77 14.48,7 12,7S6.87,6.77 4.49,6.24c-0.55,-0.12 -1.1,0.2 -1.24,0.75l0,0C3.11,7.55 3.45,8.12 4,8.25C5.61,8.61 7.35,8.86 9,9v12c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-5h2v5c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1V9c1.65,-0.14 3.39,-0.39 5,-0.75C20.55,8.12 20.89,7.55 20.75,6.99L20.75,6.99zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,6 12,6z"/>
		</vector>

res/values/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -6833,8 +6833,8 @@
		<!-- [CHAR LIMIT=100] Notification importance screen title -->
		<string name="notification_importance_title">Importance</string>

		<!-- [CHAR LIMIT=100] Notification Importance: unspecified importance level description -->
		<string name="notification_importance_unspecified">Let the app decide</string>
		<!-- [CHAR LIMIT=100 BACKUP_MESSAGE_ID=1820188704793497324] Notification Importance: unspecified importance level description -->
		<string name="notification_importance_unspecified">Allow sound</string>

		<!-- [CHAR LIMIT=100] Notification Importance: blocked importance level description -->
		<string name="notification_importance_blocked">Never show notifications</string>

src/com/android/settings/ApnEditor.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -660,7 +660,11 @@ public class ApnEditor extends SettingsPreferenceFragment
		return null;
		} else {
		String[] values = mRes.getStringArray(R.array.mvno_type_entries);
		mMvnoMatchData.setEnabled(mvnoIndex != 0);
		boolean mvnoMatchDataUneditable =
		mReadOnlyApn \|\| (mReadOnlyApnFields != null
		&& Arrays.asList(mReadOnlyApnFields)
		.contains(Telephony.Carriers.MVNO_MATCH_DATA));
		mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);
		if (newValue != null && newValue.equals(oldValue) == false) {
		if (values[mvnoIndex].equals("SPN")) {
		mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());

src/com/android/settings/Settings.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.os.Bundle;
		import com.android.settings.applications.AppOpsSummary;
		import com.android.settings.enterprise.EnterprisePrivacySettings;
		import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
		import com.android.settings.fingerprint.FingerprintSettings;
		import com.android.settings.password.ChooseLockGeneric;

		/**
		@@ -128,6 +127,9 @@ public class Settings extends SettingsActivity {
		public static class AutomaticStorageManagerSettingsActivity extends SettingsActivity { /* empty */ }
		public static class GamesStorageActivity extends SettingsActivity { /* empty */ }
		public static class MoviesStorageActivity extends SettingsActivity { /* empty */ }
		public static class PhotosStorageActivity extends SettingsActivity {
		/* empty */
		}

		public static class TopLevelSettings extends SettingsActivity { /* empty */ }
		public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }

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

+29 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import android.widget.TextView;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.Settings;
		import com.android.settings.Settings.AllApplicationsActivity;
		import com.android.settings.Settings.GamesStorageActivity;
		import com.android.settings.Settings.HighPowerApplicationsActivity;
		@@ -115,6 +116,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		public static final String EXTRA_VOLUME_UUID = "volumeUuid";
		public static final String EXTRA_VOLUME_NAME = "volumeName";
		public static final String EXTRA_STORAGE_TYPE = "storageType";
		public static final String EXTRA_WORK_ONLY = "workProfileOnly";

		private static final String EXTRA_SORT_ORDER = "sortOrder";
		private static final String EXTRA_SHOW_SYSTEM = "showSystem";
		@@ -218,6 +220,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
		public static final int STORAGE_TYPE_MUSIC = 1;
		public static final int STORAGE_TYPE_LEGACY = 2; // Show apps even if they can be categorized.
		public static final int STORAGE_TYPE_PHOTOS_VIDEOS = 3;

		// sort order
		private int mSortOrder = R.id.sort_order_alpha;
		@@ -261,6 +264,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		public static final int LIST_TYPE_MANAGE_SOURCES = 8;
		public static final int LIST_TYPE_GAMES = 9;
		public static final int LIST_TYPE_MOVIES = 10;
		public static final int LIST_TYPE_PHOTOGRAPHY = 11;


		// List types that should show instant apps.
		@@ -277,6 +281,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		private ResetAppsHelper mResetAppsHelper;
		private String mVolumeUuid;
		private int mStorageType;
		private boolean mIsWorkOnly;

		@Override
		public void onCreate(Bundle savedInstanceState) {
		@@ -324,10 +329,15 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		} else if (className.equals(MoviesStorageActivity.class.getName())) {
		mListType = LIST_TYPE_MOVIES;
		mSortOrder = R.id.sort_order_size;
		} else if (className.equals(Settings.PhotosStorageActivity.class.getName())) {
		mListType = LIST_TYPE_PHOTOGRAPHY;
		mSortOrder = R.id.sort_order_size;
		mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
		} else {
		mListType = LIST_TYPE_MAIN;
		}
		mFilter = getDefaultFilter();
		mIsWorkOnly = args != null ? args.getBoolean(EXTRA_WORK_ONLY) : false;

		if (savedInstanceState != null) {
		mSortOrder = savedInstanceState.getInt(EXTRA_SORT_ORDER, mSortOrder);
		@@ -375,6 +385,14 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		new StorageStatsSource(context),
		mVolumeUuid,
		UserHandle.of(UserHandle.getUserId(mCurrentUid))));
		} else if (mStorageType == STORAGE_TYPE_PHOTOS_VIDEOS) {
		Context context = getContext();
		mApplications.setExtraViewController(
		new PhotosViewHolderController(
		context,
		new StorageStatsSource(context),
		mVolumeUuid,
		UserHandle.of(UserHandle.getUserId(mCurrentUid))));
		}
		mListView.setAdapter(mApplications);
		mListView.setRecyclerListener(mApplications);
		@@ -423,6 +441,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		}

		AppFilter compositeFilter = getCompositeFilter(mListType, mStorageType, mVolumeUuid);
		if (mIsWorkOnly) {
		compositeFilter = new CompoundFilter(compositeFilter, FILTERS[FILTER_APPS_WORK]);
		}
		if (compositeFilter != null) {
		mApplications.setCompositeFilter(compositeFilter);
		}
		@@ -444,6 +465,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		return new CompoundFilter(ApplicationsState.FILTER_GAMES, filter);
		} else if (listType == LIST_TYPE_MOVIES) {
		return new CompoundFilter(ApplicationsState.FILTER_MOVIES, filter);
		} else if (listType == LIST_TYPE_PHOTOGRAPHY) {
		return new CompoundFilter(ApplicationsState.FILTER_PHOTOS, filter);
		}

		return null;
		@@ -473,6 +496,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		case LIST_TYPE_STORAGE:
		case LIST_TYPE_GAMES:
		case LIST_TYPE_MOVIES:
		case LIST_TYPE_PHOTOGRAPHY:
		return mSortOrder == R.id.sort_order_alpha;
		default:
		return false;
		@@ -495,6 +519,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		return MetricsEvent.APPLICATIONS_STORAGE_GAMES;
		case LIST_TYPE_MOVIES:
		return MetricsEvent.APPLICATIONS_STORAGE_MOVIES;
		case LIST_TYPE_PHOTOGRAPHY:
		return MetricsEvent.APPLICATIONS_STORAGE_PHOTOS;
		case LIST_TYPE_USAGE_ACCESS:
		return MetricsEvent.USAGE_ACCESS;
		case LIST_TYPE_HIGH_POWER:
		@@ -598,6 +624,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
		case LIST_TYPE_MOVIES:
		startAppInfoFragment(AppStorageSettings.class, R.string.storage_movies_tv);
		break;
		case LIST_TYPE_PHOTOGRAPHY:
		startAppInfoFragment(AppStorageSettings.class, R.string.storage_photos_videos);
		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
		// app. Maybe when they load the list of apps that contains managed profile apps.