Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3

src/com/android/settings/datausage/AppDataUsagePreference.java

@@ -38,6 +38,7 @@ public class AppDataUsagePreference extends AppPreference {
     public AppDataUsagePreference(Context context, AppItem item, int percent,
             UidDetailProvider provider) {
         super(context);
+        setLayoutResource(R.layout.preference_process_stats);
         setKey("app_data_usage_" + item.key);
         mItem = item;
         mPercent = percent;

src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt

@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage
+
+import android.content.Context
+import com.android.settings.R
+import com.android.settings.widget.MainSwitchBarMetadata
+import com.android.settingslib.datastore.AbstractKeyedDataObservable
+import com.android.settingslib.datastore.DataChangeReason
+import com.android.settingslib.datastore.KeyValueStore
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.ReadWritePermit
+import com.android.settingslib.metadata.SensitivityLevel
+
+class DataSaverMainSwitchPreference : MainSwitchBarMetadata, PreferenceLifecycleProvider {
+
+    override val key
+        get() = KEY
+
+    override val title
+        get() = R.string.data_saver_switch_title
+
+    override fun storage(context: Context) = createDataStore(context)
+
+    override fun getReadPermit(context: Context, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override fun getWritePermit(context: Context, value: Boolean?, myUid: Int, callingUid: Int) =
+        ReadWritePermit.ALLOW
+
+    override val sensitivityLevel
+        get() = SensitivityLevel.NO_SENSITIVITY
+
+    @Suppress("UNCHECKED_CAST")
+    private class DataSaverStore(private val dataSaverBackend: DataSaverBackend) :
+        AbstractKeyedDataObservable<String>(), KeyValueStore, DataSaverBackend.Listener {
+
+        override fun contains(key: String) = key == KEY
+
+        override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
+            dataSaverBackend.isDataSaverEnabled as T?
+
+        override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
+            dataSaverBackend.isDataSaverEnabled = value as Boolean
+        }
+
+        override fun onFirstObserverAdded() = dataSaverBackend.addListener(this)
+
+        override fun onLastObserverRemoved() = dataSaverBackend.remListener(this)
+
+        override fun onDataSaverChanged(isDataSaving: Boolean) =
+            notifyChange(KEY, DataChangeReason.UPDATE)
+    }
+
+    companion object {
+        const val KEY = "use_data_saver"
+
+        /** Creates [KeyValueStore] for data saver preference. */
+        fun createDataStore(context: Context): KeyValueStore =
+            DataSaverStore(DataSaverBackend(context))
+    }
+}

src/com/android/settings/datausage/DataSaverPreference.java

@@ -17,29 +17,39 @@ package com.android.settings.datausage;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.flags.Flags;
 
 public class DataSaverPreference extends Preference implements DataSaverBackend.Listener {
 
-    private final DataSaverBackend mDataSaverBackend;
+    private final @Nullable DataSaverBackend mDataSaverBackend;
 
     public DataSaverPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mDataSaverBackend = new DataSaverBackend(context);
+        mDataSaverBackend = isCatalystEnabled() ? null : new DataSaverBackend(context);
+    }
+
+    private boolean isCatalystEnabled() {
+        return Flags.catalyst() && Flags.catalystRestrictBackgroundParentEntry();
     }
 
     @Override
     public void onAttached() {
         super.onAttached();
-        mDataSaverBackend.addListener(this);
+        if (mDataSaverBackend != null) {
+            mDataSaverBackend.addListener(this);
+        }
     }
 
     @Override
     public void onDetached() {
         super.onDetached();
-        mDataSaverBackend.remListener(this);
+        if (mDataSaverBackend != null) {
+            mDataSaverBackend.remListener(this);
+        }
     }
 
     @Override

src/com/android/settings/datausage/DataSaverScreen.kt

@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage
+
+import android.content.Context
+import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID
+import com.android.settings.R
+import com.android.settings.Settings.DataSaverSummaryActivity
+import com.android.settings.flags.Flags
+import com.android.settings.utils.makeLaunchIntent
+import com.android.settingslib.datastore.HandlerExecutor
+import com.android.settingslib.datastore.KeyedObserver
+import com.android.settingslib.metadata.PreferenceAvailabilityProvider
+import com.android.settingslib.metadata.PreferenceLifecycleContext
+import com.android.settingslib.metadata.PreferenceLifecycleProvider
+import com.android.settingslib.metadata.PreferenceMetadata
+import com.android.settingslib.metadata.PreferenceSummaryProvider
+import com.android.settingslib.metadata.ProvidePreferenceScreen
+import com.android.settingslib.metadata.preferenceHierarchy
+import com.android.settingslib.preference.PreferenceScreenCreator
+import com.android.settings.datausage.DataSaverMainSwitchPreference.Companion.KEY as DATA_SAVER_KEY
+
+@ProvidePreferenceScreen
+class DataSaverScreen(context: Context) :
+    PreferenceScreenCreator,
+    PreferenceAvailabilityProvider,
+    PreferenceSummaryProvider,
+    PreferenceLifecycleProvider {
+
+    private val dataSaverStore = DataSaverMainSwitchPreference.createDataStore(context)
+    private lateinit var keyedObserver: KeyedObserver<String>
+
+    override val key
+        get() = KEY
+
+    override val title
+        get() = R.string.data_saver_title
+
+    override val icon: Int
+        get() = R.drawable.ic_settings_data_usage
+
+    override fun isIndexable(context: Context) =
+        DataUsageUtils.hasMobileData(context) &&
+            DataUsageUtils.getDefaultSubscriptionId(context) != INVALID_SUBSCRIPTION_ID
+
+    override fun getSummary(context: Context): CharSequence? =
+        when {
+            dataSaverStore.getBoolean(DATA_SAVER_KEY) == true ->
+                context.getString(R.string.data_saver_on)
+            else -> context.getString(R.string.data_saver_off)
+        }
+
+    override fun isAvailable(context: Context) =
+        context.resources.getBoolean(R.bool.config_show_data_saver)
+
+    override fun isFlagEnabled(context: Context) = Flags.catalystRestrictBackgroundParentEntry()
+
+    override fun fragmentClass() = DataSaverSummary::class.java
+
+    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
+        makeLaunchIntent(context, DataSaverSummaryActivity::class.java, metadata?.key)
+
+    override fun getPreferenceHierarchy(context: Context) =
+        preferenceHierarchy(this) { +DataSaverMainSwitchPreference() }
+
+    override fun hasCompleteHierarchy() = false
+
+    override fun onCreate(context: PreferenceLifecycleContext) {
+        keyedObserver = KeyedObserver { _, _ -> context.notifyPreferenceChange(KEY) }
+        dataSaverStore.addObserver(DATA_SAVER_KEY, keyedObserver, HandlerExecutor.main)
+    }
+
+    override fun onDestroy(context: PreferenceLifecycleContext) {
+        dataSaverStore.removeObserver(DATA_SAVER_KEY, keyedObserver)
+    }
+
+    companion object {
+        const val KEY = "restrict_background_parent_entry"
+    }
+}

src/com/android/settings/datausage/DataSaverSummary.kt

@@ -43,26 +43,34 @@ class DataSaverSummary : DashboardFragment() {
             return
         }
 
-        dataSaverBackend = DataSaverBackend(requireContext())
+        if (!isCatalystEnabled) {
+            dataSaverBackend = DataSaverBackend(requireContext())
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        switchBar = (activity as SettingsActivity).switchBar.apply {
-            setTitle(getString(R.string.data_saver_switch_title))
-            show()
-            addOnSwitchChangeListener { _, isChecked -> onSwitchChanged(isChecked) }
+        if (!isCatalystEnabled) {
+            switchBar = (activity as SettingsActivity).switchBar.apply {
+                setTitle(getString(R.string.data_saver_switch_title))
+                show()
+                addOnSwitchChangeListener { _, isChecked -> onSwitchChanged(isChecked) }
+            }
         }
     }
 
     override fun onResume() {
         super.onResume()
-        dataSaverBackend.addListener(dataSaverBackendListener)
+        if (!isCatalystEnabled) {
+            dataSaverBackend.addListener(dataSaverBackendListener)
+        }
     }
 
     override fun onPause() {
         super.onPause()
-        dataSaverBackend.remListener(dataSaverBackendListener)
+        if (!isCatalystEnabled) {
+            dataSaverBackend.remListener(dataSaverBackendListener)
+        }
     }
 
     private fun onSwitchChanged(isChecked: Boolean) {
@@ -79,6 +87,8 @@ class DataSaverSummary : DashboardFragment() {
     override fun getHelpResource() = R.string.help_url_data_saver
     override fun getLogTag() = TAG
 
+    override fun getPreferenceScreenBindingKey(context: Context) = DataSaverScreen.KEY
+
     private val dataSaverBackendListener = object : DataSaverBackend.Listener {
         override fun onDataSaverChanged(isDataSaving: Boolean) {
             synchronized(this) {

src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java

@@ -30,6 +30,7 @@ import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.RestrictedPreferenceHelperProvider;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -37,7 +38,7 @@ import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.AppSwitchPreference;
 
 public class UnrestrictedDataAccessPreference extends AppSwitchPreference implements
-        DataSaverBackend.Listener {
+        DataSaverBackend.Listener, RestrictedPreferenceHelperProvider {
     private static final String ECM_SETTING_IDENTIFIER = "android:unrestricted_data_access";
 
     private final ApplicationsState mApplicationsState;
@@ -78,6 +79,11 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
         return entry.info.packageName + "|" + entry.info.uid;
     }
 
+    @Override
+    public @NonNull RestrictedPreferenceHelper getRestrictedPreferenceHelper() {
+        return mHelper;
+    }
+
     @Override
     public void onAttached() {
         super.onAttached();