From 611446146c1d4e0880278237922c8f390db50a14 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 22 Dec 2022 11:57:39 +0800 Subject: [PATCH] Cleanup FeatureFlag of 2nd layer Activity navigate up button After this change, navigate up button of 2nd layer Activity will show/hide by SplitController#isActivityEmbedded. Bug: 263198464 Test: build manual visual Change-Id: I23b3b22693d1cd3b78a4c18f94f942285b9e5d07 --- core/java/android/util/FeatureFlagUtils.java | 9 --------- .../activityembedding/ActivityEmbeddingUtils.java | 12 +----------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 897e23ac90e31..6c75b111f0cb7 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -76,13 +76,6 @@ public class FeatureFlagUtils { public static final String SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME = "settings_app_allow_dark_theme_activation_at_bedtime"; - /** - * Hide back key in the Settings two pane design. - * @hide - */ - public static final String SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE = - "settings_hide_second_layer_page_navigate_up_button_in_two_pane"; - /** @hide */ public static final String SETTINGS_AUTO_TEXT_WRAPPING = "settings_auto_text_wrapping"; @@ -168,7 +161,6 @@ public class FeatureFlagUtils { DEFAULT_FLAGS.put(SETTINGS_VOLUME_PANEL_IN_SYSTEMUI, "false"); DEFAULT_FLAGS.put(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, "true"); DEFAULT_FLAGS.put(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME, "true"); - DEFAULT_FLAGS.put(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE, "true"); DEFAULT_FLAGS.put(SETTINGS_AUTO_TEXT_WRAPPING, "false"); DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_UI, "false"); DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_SHORTCUT, "false"); @@ -189,7 +181,6 @@ public class FeatureFlagUtils { PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN); PERSISTENT_FLAGS.add(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS); PERSISTENT_FLAGS.add(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME); - PERSISTENT_FLAGS.add(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE); PERSISTENT_FLAGS.add(SETTINGS_AUTO_TEXT_WRAPPING); PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_UI); PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_SHORTCUT); diff --git a/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java b/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java index 2db0a8f4f911d..14077253c6f53 100644 --- a/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java +++ b/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java @@ -20,8 +20,6 @@ import android.app.Activity; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.provider.Settings; -import android.text.TextUtils; import android.util.Log; import androidx.core.os.BuildCompat; @@ -105,15 +103,7 @@ public final class ActivityEmbeddingUtils { return false; } - final String shouldHideNavigateUpButton = - Settings.Global.getString(activity.getContentResolver(), - "settings_hide_second_layer_page_navigate_up_button_in_two_pane"); - - if (TextUtils.isEmpty(shouldHideNavigateUpButton) - || Boolean.parseBoolean(shouldHideNavigateUpButton)) { - return isActivityEmbedded(activity); - } - return false; + return isActivityEmbedded(activity); } private ActivityEmbeddingUtils() {