Merge "Renamed Storage Access to Directory Access." (ad6ba3bd) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -9193,10 +9193,10 @@
		<!-- UI debug setting: preference summary - describes the behavior of showing a dialog every time an app crashes [CHAR LIMIT=NONE] -->
		<string name="show_first_crash_dialog_summary">Show dialog every time an app crashes</string>

		<!-- Title for Storage Access settings -->
		<string name="storage_access">Storage access</string>
		<!-- Keywords for Storage Access settings -->
		<string name="keywords_storage_access">storage access scoped directory</string>
		<!-- Title for Directory Access settings -->
		<string name="directory_access">Directory access</string>
		<!-- Keywords for Directory Access settings -->
		<string name="keywords_directory_access">directory access</string>

		<!-- Account type associated with the backup account. Empty for AOSP. [DO NOT TRANSLATE] -->
		<string name="account_type"></string>

+4 −4

Original line number	Diff line number	Diff line
		@@ -113,13 +113,13 @@

		<!-- TODO(b/63720392): add when ready
		<Preference
		android:key="special_app_storage_access"
		android:title="@string/storage_access"
		android:key="special_app_directory_access"
		android:title="@string/directory_access"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		settings:keywords="@string/keywords_storage_access">
		settings:keywords="@string/keywords_directory_access">
		<extra
		android:name="classname"
		android:value="com.android.settings.Settings$StorageAccessSettingsActivity" />
		android:value="com.android.settings.Settings$DirectoryeAccessSettingsActivity" />
		</Preference>
		-->

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ public class Settings extends SettingsActivity {
		public static class PhotosStorageActivity extends SettingsActivity {
		/* empty */
		}
		public static class StorageAccessSettingsActivity extends SettingsActivity { /* empty */ }
		public static class DirectoryAccessSettingsActivity extends SettingsActivity { /* empty */ }

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -34,11 +34,11 @@ import com.android.settingslib.applications.ApplicationsState.AppFilter;
		import java.util.Set;

		// TODO(b/63720392): add unit tests
		public class AppStateStorageAccessBridge extends AppStateBaseBridge {
		public class AppStateDirectoryAccessBridge extends AppStateBaseBridge {

		private static final String TAG = "StorageAccessBridge";
		private static final String TAG = "DirectoryAccessBridge";

		public AppStateStorageAccessBridge(ApplicationsState appState, Callback callback) {
		public AppStateDirectoryAccessBridge(ApplicationsState appState, Callback callback) {
		super(appState, callback);
		}

		@@ -48,7 +48,7 @@ public class AppStateStorageAccessBridge extends AppStateBaseBridge {
		@Override
		protected void updateExtraInfo(AppEntry app, String pkg, int uid) { }

		public static final AppFilter FILTER_APP_HAS_STORAGE_ACCESS = new AppFilter() {
		public static final AppFilter FILTER_APP_HAS_DIRECTORY_ACCESS = new AppFilter() {

		private Set<String> mPackages;

+4 −4

Original line number	Diff line number	Diff line
		@@ -38,13 +38,13 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;

		/**
		* Detailed settings for an app's storage access permissions (A.K.A Scoped Directory Access).
		* Detailed settings for an app's directory access permissions (A.K.A Scoped Directory Access).
		*/
		// TODO(b/63720392): explain its layout
		// TODO(b/63720392): add unit tests
		public class StorageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
		public class DirectoryAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
		OnPreferenceClickListener {
		private static final String MY_TAG = "StorageAccessDetails";
		private static final String MY_TAG = "DirectoryAccessDetails";

		@Override
		public void onCreate(Bundle savedInstanceState) {
		@@ -105,6 +105,6 @@ public class StorageAccessDetails extends AppInfoWithHeader implements OnPrefere

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL;
		return MetricsEvent.APPLICATIONS_DIRECTORY_ACCESS_DETAIL;
		}
		}