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

Commit 55b577df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove silky flag from misc files" into sc-dev

parents ea2b64a9 1aadccac

src/com/android/settings/Utils.java

+1 −5
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ import androidx.preference.PreferenceGroup; 
import com.android.internal.app.UnlaunchableAppActivity;

import com.android.internal.util.ArrayUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.core.FeatureFlags;

import com.android.settings.dashboard.profileselector.ProfileFragmentBridge;

import com.android.settings.dashboard.profileselector.ProfileSelectFragment;

import com.android.settings.password.ChooseLockSettingsHelper;
@@ -1228,10 +1227,7 @@ public final class Utils extends com.android.settingslib.Utils { 
    }



    public static boolean isPageTransitionEnabled(Context context) {

        final boolean isSilkyHome = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME);

        final boolean isTransitionEnabled = Settings.Global.getInt(context.getContentResolver(),

        return Settings.Global.getInt(context.getContentResolver(),

                SETTINGS_SHARED_AXIS_ENABLED, 0) == 1;



        return isSilkyHome && isTransitionEnabled;

    }

}

src/com/android/settings/inputmethod/UserDictionarySettings.java

+1 −6
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.database.Cursor; 
import android.os.Bundle;

import android.provider.UserDictionary;

import android.text.TextUtils;

import android.util.FeatureFlagUtils;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuInflater;
@@ -45,7 +44,6 @@ import androidx.loader.app.LoaderManager; 
import androidx.loader.content.Loader;



import com.android.settings.R;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.Instrumentable;
@@ -106,10 +104,7 @@ public class UserDictionarySettings extends ListFragment implements Instrumentab 
    @Override

    public View onCreateView(

            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

        // TODO(b/176883483): Remove the title after material component updated

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {

        getActivity().setTitle(R.string.user_dict_settings_title);

        }

        // Show the language as a subtitle of the action bar

        final ActionBar actionBar = getActivity().getActionBar();

        if (actionBar != null) {