From 9ffa4d241f060563d4a1e80f9271ce3551f8176c Mon Sep 17 00:00:00 2001 From: Vaibhav Devmurari Date: Thu, 23 Jan 2025 17:01:48 +0000 Subject: [PATCH] Flag cleanup in Settings: keyboard_layout_preview_flag Test: manual Bug: 293579375 Flag: EXEMPT cleanup Change-Id: I1f13ab0ab46883622d024f982faba26b1dce0152 --- .../NewKeyboardLayoutPickerFragment.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java index 674b5bf7cce..ccf2b2658f9 100644 --- a/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java @@ -28,14 +28,11 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.TextView; import androidx.fragment.app.Fragment; -import com.android.hardware.input.Flags; import com.android.settings.R; import com.android.settings.activityembedding.ActivityEmbeddingUtils; @@ -87,9 +84,6 @@ public class NewKeyboardLayoutPickerFragment extends Fragment { getPickerLayout(getResources().getConfiguration()), container, false); mKeyboardLayoutPreview = fragmentView.findViewById(R.id.keyboard_layout_preview); mKeyboardLayoutPreviewText = fragmentView.findViewById(R.id.keyboard_layout_preview_name); - if (!Flags.keyboardLayoutPreviewFlag()) { - updateViewMarginForPreviewFlagOff(fragmentView); - } getActivity().getSupportFragmentManager() .beginTransaction() .replace(R.id.keyboard_layout_title, new NewKeyboardLayoutPickerTitle()) @@ -110,13 +104,4 @@ public class NewKeyboardLayoutPickerFragment extends Fragment { && configuration.orientation == ORIENTATION_LANDSCAPE ? R.layout.keyboard_layout_picker_one_pane_land : R.layout.keyboard_layout_picker; } - - private void updateViewMarginForPreviewFlagOff(ViewGroup fragmentView) { - LinearLayout previewContainer = fragmentView.findViewById( - R.id.keyboard_layout_picker_container); - FrameLayout.LayoutParams previewContainerLayoutParams = - (FrameLayout.LayoutParams) previewContainer.getLayoutParams(); - previewContainerLayoutParams.setMargins(0, 0, 0, 0); - previewContainer.setLayoutParams(previewContainerLayoutParams); - } }