Merge "Rename back button to navigate up button" into tm-dev

This commit is contained in:
Tsung-Mao Fang
2022-03-09 04:12:55 +00:00
committed by Android (Google) Code Review
5 changed files with 14 additions and 15 deletions

View File

@@ -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));
}