From 5a3fb30101a9af2a39f86cc6c9d47233036663aa Mon Sep 17 00:00:00 2001 From: yuhuitech <807587186@qq.com> Date: Thu, 26 Aug 2021 17:52:35 +0800 Subject: [PATCH 1/2] fixed the blocked texts on the third 'setting up' page --- .../inputmethod/latin/setup/SetupWizardActivity.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java index 246bbfde6..84e245d3f 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java @@ -22,21 +22,26 @@ import android.content.res.Resources; import android.media.MediaPlayer; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Message; import android.provider.Settings; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.widget.ImageView; import android.widget.TextView; import android.widget.VideoView; +import androidx.annotation.RequiresApi; + import org.dslul.openboard.inputmethod.latin.R; import org.dslul.openboard.inputmethod.latin.settings.SettingsActivity; import org.dslul.openboard.inputmethod.latin.utils.LeakGuardHandlerWrapper; import org.dslul.openboard.inputmethod.latin.utils.UncachedInputMethodManagerUtils; +import org.w3c.dom.Text; import java.util.ArrayList; @@ -439,8 +444,8 @@ static final class SetupStep implements View.OnClickListener { private Runnable mAction; public SetupStep(final int stepNo, final String applicationName, final TextView bulletView, - final View stepView, final int title, final int instruction, - final int finishedInstruction, final int actionIcon, final int actionLabel) { + final View stepView, final int title, final int instruction, + final int finishedInstruction, final int actionIcon, final int actionLabel) { mStepNo = stepNo; mStepView = stepView; mBulletView = bulletView; @@ -457,6 +462,9 @@ public SetupStep(final int stepNo, final String applicationName, final TextView mActionLabel = mStepView.findViewById(R.id.setup_step_action_label); mActionLabel.setText(res.getString(actionLabel)); + ViewGroup.LayoutParams params = mActionLabel.getLayoutParams(); + params.height = ViewGroup.LayoutParams.WRAP_CONTENT; + mActionLabel.setLayoutParams(params); if (actionIcon == 0) { final int paddingEnd = mActionLabel.getPaddingEnd(); mActionLabel.setPaddingRelative(paddingEnd, 0, paddingEnd, 0); From 2ce529a9a05878cf220ca21b7e54d92f4e6b5477 Mon Sep 17 00:00:00 2001 From: yuhuitech <807587186@qq.com> Date: Fri, 27 Aug 2021 11:07:02 +0800 Subject: [PATCH 2/2] revoked the changes applied to the java file --- .../inputmethod/latin/setup/SetupWizardActivity.java | 12 ++---------- app/src/main/res/layout/setup_step.xml | 1 + 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java index 84e245d3f..246bbfde6 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java @@ -22,26 +22,21 @@ import android.content.res.Resources; import android.media.MediaPlayer; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Message; import android.provider.Settings; import android.util.Log; import android.view.View; -import android.view.ViewGroup; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.widget.ImageView; import android.widget.TextView; import android.widget.VideoView; -import androidx.annotation.RequiresApi; - import org.dslul.openboard.inputmethod.latin.R; import org.dslul.openboard.inputmethod.latin.settings.SettingsActivity; import org.dslul.openboard.inputmethod.latin.utils.LeakGuardHandlerWrapper; import org.dslul.openboard.inputmethod.latin.utils.UncachedInputMethodManagerUtils; -import org.w3c.dom.Text; import java.util.ArrayList; @@ -444,8 +439,8 @@ static final class SetupStep implements View.OnClickListener { private Runnable mAction; public SetupStep(final int stepNo, final String applicationName, final TextView bulletView, - final View stepView, final int title, final int instruction, - final int finishedInstruction, final int actionIcon, final int actionLabel) { + final View stepView, final int title, final int instruction, + final int finishedInstruction, final int actionIcon, final int actionLabel) { mStepNo = stepNo; mStepView = stepView; mBulletView = bulletView; @@ -462,9 +457,6 @@ public SetupStep(final int stepNo, final String applicationName, final TextView mActionLabel = mStepView.findViewById(R.id.setup_step_action_label); mActionLabel.setText(res.getString(actionLabel)); - ViewGroup.LayoutParams params = mActionLabel.getLayoutParams(); - params.height = ViewGroup.LayoutParams.WRAP_CONTENT; - mActionLabel.setLayoutParams(params); if (actionIcon == 0) { final int paddingEnd = mActionLabel.getPaddingEnd(); mActionLabel.setPaddingRelative(paddingEnd, 0, paddingEnd, 0); diff --git a/app/src/main/res/layout/setup_step.xml b/app/src/main/res/layout/setup_step.xml index fa84902bf..f6e786917 100644 --- a/app/src/main/res/layout/setup_step.xml +++ b/app/src/main/res/layout/setup_step.xml @@ -33,6 +33,7 @@ android:paddingBottom="@dimen/setup_step_vertical_padding" />