Merge "[Expressive Design] Migrate Photopicker Cloud Settings activity" into main

2 files changed, 10 insertions, 33 deletions

diff --git a/src/com/android/providers/media/photopicker/PhotoPickerSettingsActivity.java b/src/com/android/providers/media/photopicker/PhotoPickerSettingsActivity.java
index ce885ae34..2818f3154 100644
--- a/src/com/android/providers/media/photopicker/PhotoPickerSettingsActivity.java
+++ b/src/com/android/providers/media/photopicker/PhotoPickerSettingsActivity.java
@@ -36,9 +36,6 @@ import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
 
 import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -54,6 +51,7 @@ import com.android.providers.media.photopicker.data.model.UserId;
 import com.android.providers.media.photopicker.ui.settings.SettingsProfileSelectFragment;
 import com.android.providers.media.photopicker.ui.settings.SettingsViewModel;
 import com.android.providers.media.photopicker.util.RecentsPreviewUtil;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarAppCompatActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -62,7 +60,7 @@ import java.util.List;
 /**
  * Photo Picker settings page where user can view/edit current cloud media provider.
  */
-public class PhotoPickerSettingsActivity extends AppCompatActivity {
+public class PhotoPickerSettingsActivity extends CollapsingToolbarAppCompatActivity {
     private static final String TAG = "PickerSettings";
     static final String EXTRA_CURRENT_USER_ID = "user_id";
     private static final int DEFAULT_EXTRA_USER_ID = -1;
@@ -107,8 +105,8 @@ public class PhotoPickerSettingsActivity extends AppCompatActivity {
             mCallingUserId = DEFAULT_EXTRA_USER_ID;
         }
 
+        setTitle(R.string.picker_settings_title);
         setContentView(R.layout.activity_photo_picker_settings);
-        displayActionBar();
         createAndShowFragment(mCallingUserId, /* allowReplace= */ false);
 
         View settingsView = findViewById(R.id.settings_activity_root);
@@ -154,14 +152,6 @@ public class PhotoPickerSettingsActivity extends AppCompatActivity {
                 mSettingsViewModel.getUserManagerState(), this);
     }
 
-    private void displayActionBar() {
-        final Toolbar toolbar = findViewById(R.id.picker_settings_toolbar);
-        setSupportActionBar(toolbar);
-        final ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setDisplayShowTitleEnabled(false);
-    }
-
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
diff --git a/src/com/android/providers/media/photopicker/ui/settings/SettingsCloudMediaSelectFragment.java b/src/com/android/providers/media/photopicker/ui/settings/SettingsCloudMediaSelectFragment.java
index 7d0586476..fce75ae19 100644
--- a/src/com/android/providers/media/photopicker/ui/settings/SettingsCloudMediaSelectFragment.java
+++ b/src/com/android/providers/media/photopicker/ui/settings/SettingsCloudMediaSelectFragment.java
@@ -32,18 +32,19 @@ import androidx.annotation.UiThread;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
 import com.android.providers.media.R;
 import com.android.providers.media.photopicker.data.model.UserId;
 import com.android.settingslib.widget.SelectorWithWidgetPreference;
+import com.android.settingslib.widget.SettingsBasePreferenceFragment;
 
 /**
  * This fragment will display a list of available cloud providers for the profile selected.
  * Users can view or change the preferred cloud provider media app.
  */
-public class SettingsCloudMediaSelectFragment extends PreferenceFragmentCompat
+public class SettingsCloudMediaSelectFragment extends SettingsBasePreferenceFragment
         implements SelectorWithWidgetPreference.OnClickListener {
     public static final String EXTRA_TAB_USER_ID = "user_id";
     private static final String TAG = "SettingsCMSelectFgmt";
@@ -91,7 +92,7 @@ public class SettingsCloudMediaSelectFragment extends PreferenceFragmentCompat
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        super.addPreferencesFromResource(R.xml.pref_screen_picker_settings);
+        super.addPreferencesFromResource(R.xml.cloud_media_selection_settings);
 
         mSettingsCloudMediaViewModel.loadData(getConfigStore());
         observeMediaCollectionInfoChanges();
@@ -101,12 +102,12 @@ public class SettingsCloudMediaSelectFragment extends PreferenceFragmentCompat
     @UiThread
     private void refreshUI() {
         final PreferenceScreen screen = getPreferenceScreen();
-        resetPreferenceScreen(screen);
 
-        screen.addPreference(buildTitlePreference());
+        final PreferenceGroup preferenceGroup = findPreference("cloud_media_provider_options");
+
         for (CloudMediaProviderOption provider :
                 mSettingsCloudMediaViewModel.getProviderOptions()) {
-            screen.addPreference(buildProviderOptionPreference(provider));
+            preferenceGroup.addPreference(buildProviderOptionPreference(provider));
         }
 
         updateSelectedRadioButton();
@@ -182,24 +183,10 @@ public class SettingsCloudMediaSelectFragment extends PreferenceFragmentCompat
         return pref;
     }
 
-    @NonNull
-    private Preference buildTitlePreference() {
-        final Preference titlePref = new Preference(getPrefContext());
-        titlePref.setTitle(R.string.picker_settings_selection_message);
-        titlePref.setSelectable(false);
-        titlePref.setPersistent(false);
-        titlePref.setLayoutResource(R.layout.pref_settings_cloud_select_title);
-        return titlePref;
-    }
-
     private Context getPrefContext() {
         return getPreferenceManager().getContext();
     }
 
-    private void resetPreferenceScreen(PreferenceScreen screen) {
-        screen.removeAll();
-    }
-
     @NonNull
     private UserId getUserId() {
         if (getArguments() != null && getArguments().containsKey(EXTRA_TAB_USER_ID)) {