diff options
author | Yi-Ling Chuang <emilychuang@google.com> | 2021-01-29 11:41:22 +0800 |
---|---|---|
committer | Yi-Ling Chuang <emilychuang@google.com> | 2021-01-29 15:40:36 +0800 |
commit | c55901d2c0f31a8738528793e8deeccd131e00e3 (patch) | |
tree | f9a639d7204ac9c0018898260dfc4acf3dbc2fb6 /src/com/android/settings/SettingsActivity.java | |
parent | 1e1c813354f550e225d98a81d7384027af347194 (diff) | |
download | packages_apps_Settings-c55901d2c0f31a8738528793e8deeccd131e00e3.tar.gz packages_apps_Settings-c55901d2c0f31a8738528793e8deeccd131e00e3.tar.bz2 packages_apps_Settings-c55901d2c0f31a8738528793e8deeccd131e00e3.zip |
Fix the transition of the up-button.
We've applied a new transition from Search to Settings, where if users
click on the up-button, the transition will not be applied. Hence, this
CL makes the up-button behave the same as the back key to address this.
- Also remove the transition target as it is not necessary.
Fixes: 177968777
Test: 1. Search "Gesture"
2. Click on "Gesture"
3. Tap the up-button and see the applied transition
Change-Id: I046424f244426750d98046703c05ae0a1d567c67
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
-rw-r--r-- | src/com/android/settings/SettingsActivity.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index bb20c4cbc0..d22a38117a 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -238,12 +238,10 @@ public class SettingsActivity extends SettingsBaseActivity 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); } |