diff options
author | Yi-Ling Chuang <emilychuang@google.com> | 2021-01-14 18:53:14 +0800 |
---|---|---|
committer | Yi-Ling Chuang <emilychuang@google.com> | 2021-01-14 19:07:18 +0800 |
commit | 2af2d0bf39025c97b5854d2aa1a97e3ebdf0e2c9 (patch) | |
tree | ebd5700bb8a9ec70b1572d9b5422d87a242d325c /src/com/android/settings/SettingsActivity.java | |
parent | 98814b89cf8951e6a60121ffe617af535bdc47db (diff) | |
download | packages_apps_Settings-2af2d0bf39025c97b5854d2aa1a97e3ebdf0e2c9.tar.gz packages_apps_Settings-2af2d0bf39025c97b5854d2aa1a97e3ebdf0e2c9.tar.bz2 packages_apps_Settings-2af2d0bf39025c97b5854d2aa1a97e3ebdf0e2c9.zip |
Redirect users from Search to Settings with transition.
Currently there is no transition while redirecting users from Settings
Search result to Settings. This CL gets Shared X-Axis transition applied
to make a better visual experience.
Bug: 177480699
Test: Click on a search result and see the transition.
Change-Id: Iad9b0c1168a939582e2648bc023c1321f9ec8049
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
-rw-r--r-- | src/com/android/settings/SettingsActivity.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 7f214f67e2..8eba363a98 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -36,8 +36,10 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; +import android.util.FeatureFlagUtils; import android.util.Log; import android.view.View; +import android.view.Window; import android.widget.Button; import androidx.annotation.Nullable; @@ -53,6 +55,7 @@ import androidx.preference.PreferenceManager; import com.android.internal.util.ArrayUtils; import com.android.settings.Settings.WifiSettingsActivity; import com.android.settings.applications.manageapplications.ManageApplications; +import com.android.settings.core.FeatureFlags; import com.android.settings.core.OnActivityResultListener; import com.android.settings.core.SettingsBaseActivity; import com.android.settings.core.SubSettingLauncher; @@ -67,6 +70,7 @@ import com.android.settingslib.core.instrumentation.SharedPreferencesLogger; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.drawer.DashboardCategory; +import com.google.android.material.transition.platform.MaterialSharedAxis; import com.google.android.setupcompat.util.WizardManagerHelper; import java.util.ArrayList; @@ -229,6 +233,20 @@ public class SettingsActivity extends SettingsBaseActivity @Override protected void onCreate(Bundle savedState) { + if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)) { + // Enable Activity transitions + getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS); + final MaterialSharedAxis enterTransition = new MaterialSharedAxis( + MaterialSharedAxis.X, /* forward */true); + enterTransition.addTarget(R.id.content_parent); + getWindow().setEnterTransition(enterTransition); + + final MaterialSharedAxis returnTransition = new MaterialSharedAxis( + MaterialSharedAxis.X, /* forward */false); + returnTransition.addTarget(R.id.content_parent); + getWindow().setReturnTransition(returnTransition); + } + super.onCreate(savedState); Log.d(LOG_TAG, "Starting onCreate"); long startTime = System.currentTimeMillis(); |