Merge "Remove animation from private space settings page" into main

This commit is contained in:
Joseph Vincent
2024-06-10 19:27:39 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 19 deletions

View File

@@ -22,16 +22,10 @@
android:title="@string/private_space_title"
settings:searchable="false">
<com.android.settingslib.widget.IllustrationPreference
android:key="private_space_illustration"
settings:searchable="false"
settings:lottie_rawRes="@raw/private_space_illustration"/>
<Preference
<com.android.settingslib.widget.TopIntroPreference
android:key="private_space_description"
android:summary="@string/private_space_description"
android:selectable="false"
settings:searchable="false" />
android:title="@string/private_space_description"
settings:searchable="false"/>
<PreferenceCategory
android:title="@string/private_space_category_lock">

View File

@@ -26,12 +26,10 @@ import android.widget.Toast;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.widget.IllustrationPreference;
/** Fragment representing the Private Space dashboard in Settings. */
public class PrivateSpaceDashboardFragment extends DashboardFragment {
private static final String TAG = "PSDashboardFragment";
private static final String PRIVATE_SPACE_ILLUSTRATION_KEY = "private_space_illustration";
@Override
public void onCreate(Bundle icicle) {
@@ -63,14 +61,6 @@ public class PrivateSpaceDashboardFragment extends DashboardFragment {
}
}
@Override
public void onResume() {
super.onResume();
final IllustrationPreference illustrationPreference =
getPreferenceScreen().findPreference(PRIVATE_SPACE_ILLUSTRATION_KEY);
illustrationPreference.applyDynamicColor();
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.private_space_settings;