PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the transition of the up-button." into sc-dev am: 20fa1428bc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id09a774dcf7bed2d78cf7588a74f85783c85fdd8
This commit is contained in:
TreeHugger Robot
2021-01-29 20:44:52 +00:00
committed by Automerger Merge Worker
parent 31479278ad 20fa1428bc
commit 228bb300c8
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SettingsActivity.java
View File

@@ -238,12 +238,10 @@ public class SettingsActivity extends SettingsBaseActivity
getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS); getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
final MaterialSharedAxis enterTransition = new MaterialSharedAxis( final MaterialSharedAxis enterTransition = new MaterialSharedAxis(
MaterialSharedAxis.X, /* forward */true); MaterialSharedAxis.X, /* forward */true);
enterTransition.addTarget(R.id.content_parent);
getWindow().setEnterTransition(enterTransition); getWindow().setEnterTransition(enterTransition);
final MaterialSharedAxis returnTransition = new MaterialSharedAxis( final MaterialSharedAxis returnTransition = new MaterialSharedAxis(
MaterialSharedAxis.X, /* forward */false); MaterialSharedAxis.X, /* forward */false);
returnTransition.addTarget(R.id.content_parent);
getWindow().setReturnTransition(returnTransition); getWindow().setReturnTransition(returnTransition);
} }

13
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -32,11 +32,13 @@ import android.util.ArraySet;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.widget.Toolbar; import android.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import com.android.settings.R; import com.android.settings.R;
@@ -167,6 +169,17 @@ public class SettingsBaseActivity extends FragmentActivity {
((ViewGroup) findViewById(R.id.content_frame)).addView(view, params); ((ViewGroup) findViewById(R.id.content_frame)).addView(view, params);
} }
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
final int id = item.getItemId();
if (id == android.R.id.home) {
// Make the up button behave the same as the back button.
onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override @Override
public void setTitle(CharSequence title) { public void setTitle(CharSequence title) {
if (mCollapsingToolbarLayout != null) { if (mCollapsingToolbarLayout != null) {