commit 97976bc3459cbd7e29a157ad4b298355affb37bd
author Lucas Silva <lusilva@google.com> Fri Jan 13 19:06:27 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 13 19:06:27 2023 +0000
tree 1fa8d9b212b27ea68c45472ad650ea9a24089f08
parent 6367188b33262ffaa95eb326ab620c0f489e8da4
parent 8f83cc6b4561971c6d4f3bddc5ae102e2cd4222a

Merge "Display back button on home settings." into tm-qpr-dev

src/com/android/launcher3/settings/SettingsActivity.java

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 7ab3013..d2f82c2 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -93,7 +93,8 @@
         WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
 
         Intent intent = getIntent();
-        if (intent.hasExtra(EXTRA_FRAGMENT) || intent.hasExtra(EXTRA_FRAGMENT_ARGS)) {
+        if (intent.hasExtra(EXTRA_FRAGMENT) || intent.hasExtra(EXTRA_FRAGMENT_ARGS)
+                || intent.hasExtra(EXTRA_FRAGMENT_ARG_KEY)) {
             getActionBar().setDisplayHomeAsUpEnabled(true);
         }