Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76eef6d8 authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

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

parents 7012fb16 8298c15f

res/xml/private_space_settings.xml

+3 −9
Original line number Diff line number Diff line
@@ -22,15 +22,9 @@ 
    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"

        android:title="@string/private_space_description"

        settings:searchable="false"/>



    <PreferenceCategory

src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java

+0 −10
Original line number Diff line number Diff line
@@ -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;