From 00cbd72c60c956e43e2339907198cb200bda8bf0 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 17 Feb 2022 20:02:29 +0800 Subject: [PATCH] Rename back button to navigate up button A minor wording review. Test: build pass Bug: 219000314 Change-Id: I23bc580b193cc891b659514d13705db2c55b756a Merged-In: I23bc580b193cc891b659514d13705db2c55b756a --- src/com/android/settings/SettingsActivity.java | 9 ++++----- .../ActivityEmbeddingRulesController.java | 2 +- .../android/settings/core/SubSettingLauncher.java | 12 ++++++------ .../featureflags/FeatureFlagPreference.java | 4 ++-- .../android/settings/homepage/TopLevelSettings.java | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 37d4a4e99eb..d258cc2fcc3 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -144,8 +144,7 @@ public class SettingsActivity extends SettingsBaseActivity public static final String EXTRA_SHOW_FRAGMENT_AS_SUBSETTING = ":settings:show_fragment_as_subsetting"; - public static final String EXTRA_IS_SECONDARY_LAYER_PAGE = - ":settings:is_secondary_layer_page"; + public static final String EXTRA_IS_SECOND_LAYER_PAGE = ":settings:is_second_layer_page"; /** * Additional extra of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK. @@ -372,12 +371,12 @@ public class SettingsActivity extends SettingsBaseActivity if (WizardManagerHelper.isAnySetupWizard(intent)) { return false; } - final boolean isSecondaryLayerPage = - intent.getBooleanExtra(EXTRA_IS_SECONDARY_LAYER_PAGE, false); + final boolean isSecondLayerPage = + intent.getBooleanExtra(EXTRA_IS_SECOND_LAYER_PAGE, false); // TODO: move Settings's ActivityEmbeddingUtils to SettingsLib. return !com.android.settingslib.activityembedding.ActivityEmbeddingUtils - .shouldHideBackButton(this, isSecondaryLayerPage); + .shouldHideNavigateUpButton(this, isSecondLayerPage); } private boolean isSubSettings(Intent intent) { diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java index dee24dfefb4..124bb4f2707 100644 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java +++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java @@ -197,7 +197,7 @@ public class ActivityEmbeddingRulesController { addActivityFilter(activityFilters, Settings.class); final Intent intent = new Intent(mContext, Settings.NetworkDashboardActivity.class); - intent.putExtra(SettingsActivity.EXTRA_IS_SECONDARY_LAYER_PAGE, true); + intent.putExtra(SettingsActivity.EXTRA_IS_SECOND_LAYER_PAGE, true); final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule( activityFilters, intent, diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java index 93a939febf1..e8c42197607 100644 --- a/src/com/android/settings/core/SubSettingLauncher.java +++ b/src/com/android/settings/core/SubSettingLauncher.java @@ -122,9 +122,9 @@ public class SubSettingLauncher { return this; } - /** Decide whether the next page is secondary layer page or not. */ - public SubSettingLauncher setIsSecondaryLayerPage(boolean isSecondaryLayerPage) { - mLaunchRequest.mIsSecondaryLayerPage = isSecondaryLayerPage; + /** Decide whether the next page is second layer page or not. */ + public SubSettingLauncher setIsSecondLayerPage(boolean isSecondLayerPage) { + mLaunchRequest.mIsSecondLayerPage = isSecondLayerPage; return this; } @@ -176,8 +176,8 @@ public class SubSettingLauncher { intent.addFlags(mLaunchRequest.mFlags); intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE, mLaunchRequest.mTransitionType); - intent.putExtra(SettingsActivity.EXTRA_IS_SECONDARY_LAYER_PAGE, - mLaunchRequest.mIsSecondaryLayerPage); + intent.putExtra(SettingsActivity.EXTRA_IS_SECOND_LAYER_PAGE, + mLaunchRequest.mIsSecondLayerPage); return intent; } @@ -225,6 +225,6 @@ public class SubSettingLauncher { int mTransitionType; Bundle mArguments; Bundle mExtras; - boolean mIsSecondaryLayerPage; + boolean mIsSecondLayerPage; } } diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java index 992aa0f6726..08ae760684b 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java @@ -52,10 +52,10 @@ public class FeatureFlagPreference extends SwitchPreference { FeatureFlagUtils.setEnabled(getContext(), mKey, isChecked); } - // A temporary logic for settings_hide_secondary_page_back_button_in_two_pane + // A temporary logic for settings_hide_second_layer_page_navigate_up_button_in_two_pane // Remove it before Android T release. if (TextUtils.equals(mKey, - FeatureFlagUtils.SETTINGS_HIDE_SECONDARY_PAGE_BACK_BUTTON_IN_TWO_PANE)) { + FeatureFlagUtils.SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE)) { Settings.Global.putString(getContext().getContentResolver(), mKey, String.valueOf(isChecked)); } diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index 734e079537d..7d578347e7e 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -119,7 +119,7 @@ public class TopLevelSettings extends DashboardFragment implements ? ((Instrumentable) caller).getMetricsCategory() : Instrumentable.METRICS_CATEGORY_UNKNOWN) .setTitleRes(-1) - .setIsSecondaryLayerPage(true) + .setIsSecondLayerPage(true) .launch(); return true; }