PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Flag cleanup in Settings: keyboard_layout_preview_flag" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-01-31 09:02:36 -08:00
committed by Android (Google) Code Review
parent 8a53aecafe 9ffa4d241f
commit 089ce7465d
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/inputmethod/NewKeyboardLayoutPickerFragment.java
View File

@@ -28,14 +28,11 @@ import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.android.hardware.input.Flags;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.activityembedding.ActivityEmbeddingUtils; import com.android.settings.activityembedding.ActivityEmbeddingUtils;
@@ -87,9 +84,6 @@ public class NewKeyboardLayoutPickerFragment extends Fragment {
getPickerLayout(getResources().getConfiguration()), container, false); getPickerLayout(getResources().getConfiguration()), container, false);
mKeyboardLayoutPreview = fragmentView.findViewById(R.id.keyboard_layout_preview); mKeyboardLayoutPreview = fragmentView.findViewById(R.id.keyboard_layout_preview);
mKeyboardLayoutPreviewText = fragmentView.findViewById(R.id.keyboard_layout_preview_name); mKeyboardLayoutPreviewText = fragmentView.findViewById(R.id.keyboard_layout_preview_name);
if (!Flags.keyboardLayoutPreviewFlag()) {
updateViewMarginForPreviewFlagOff(fragmentView);
}
getActivity().getSupportFragmentManager() getActivity().getSupportFragmentManager()
.beginTransaction() .beginTransaction()
.replace(R.id.keyboard_layout_title, new NewKeyboardLayoutPickerTitle()) .replace(R.id.keyboard_layout_title, new NewKeyboardLayoutPickerTitle())
@@ -110,13 +104,4 @@ public class NewKeyboardLayoutPickerFragment extends Fragment {
&& configuration.orientation == ORIENTATION_LANDSCAPE && configuration.orientation == ORIENTATION_LANDSCAPE
? R.layout.keyboard_layout_picker_one_pane_land : R.layout.keyboard_layout_picker; ? 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);
}
} }