Merge "DO NOT MERGE Opening links settings to define app link state and supported domains" into pi-car-dev
diff --git a/res/xml/app_storage_settings_details_fragment.xml b/res/xml/app_storage_settings_details_fragment.xml
index 00e0627..b9eeb41 100644
--- a/res/xml/app_storage_settings_details_fragment.xml
+++ b/res/xml/app_storage_settings_details_fragment.xml
@@ -19,7 +19,7 @@
android:title="@string/storage_settings_title">
<Preference
android:key="@string/pk_storage_application_details"
- settings:controller="com.android.car.settings.applications.ApplicationWithVersionPreferenceController"/>
+ settings:controller="com.android.car.settings.storage.StorageApplicationPreferenceController"/>
<com.android.car.settings.storage.StorageAppDetailPreference
android:key="@string/pk_storage_application_size"
android:selectable="false"
diff --git a/src/com/android/car/settings/storage/AppStorageSettingsDetailsFragment.java b/src/com/android/car/settings/storage/AppStorageSettingsDetailsFragment.java
index 55fb71a..08f65dc 100644
--- a/src/com/android/car/settings/storage/AppStorageSettingsDetailsFragment.java
+++ b/src/com/android/car/settings/storage/AppStorageSettingsDetailsFragment.java
@@ -37,7 +37,6 @@
import androidx.loader.app.LoaderManager;
import com.android.car.settings.R;
-import com.android.car.settings.applications.ApplicationWithVersionPreferenceController;
import com.android.car.settings.common.ConfirmationDialogFragment;
import com.android.car.settings.common.Logger;
import com.android.car.settings.common.SettingsFragment;
@@ -160,7 +159,7 @@
}
mAppsStorageStatsManager = new AppsStorageStatsManager(context);
mAppsStorageStatsManager.registerListener(this);
- use(ApplicationWithVersionPreferenceController.class,
+ use(StorageApplicationPreferenceController.class,
R.string.pk_storage_application_details)
.setAppEntry(mAppEntry)
.setAppState(mAppState);
diff --git a/src/com/android/car/settings/applications/ApplicationWithVersionPreferenceController.java b/src/com/android/car/settings/storage/StorageApplicationPreferenceController.java
similarity index 75%
rename from src/com/android/car/settings/applications/ApplicationWithVersionPreferenceController.java
rename to src/com/android/car/settings/storage/StorageApplicationPreferenceController.java
index d8c1fcf..ed55031 100644
--- a/src/com/android/car/settings/applications/ApplicationWithVersionPreferenceController.java
+++ b/src/com/android/car/settings/storage/StorageApplicationPreferenceController.java
@@ -14,19 +14,23 @@
* limitations under the License.
*/
-package com.android.car.settings.applications;
+package com.android.car.settings.storage;
import android.car.drivingstate.CarUxRestrictions;
import android.content.Context;
import androidx.preference.Preference;
+import com.android.car.settings.applications.ApplicationPreferenceController;
import com.android.car.settings.common.FragmentController;
-/** Preference showing the application icon, title, and version. */
-public class ApplicationWithVersionPreferenceController extends ApplicationPreferenceController {
+/**
+ * Preference showing the application icon, title and version on the storage size application
+ * details page.
+ */
+public class StorageApplicationPreferenceController extends ApplicationPreferenceController {
- public ApplicationWithVersionPreferenceController(Context context,
+ public StorageApplicationPreferenceController(Context context,
String preferenceKey, FragmentController fragmentController,
CarUxRestrictions uxRestrictions) {
super(context, preferenceKey, fragmentController, uxRestrictions);