replaced on-screen RF3 scissors icon with a material scissors icon
This commit is contained in:
parent
a5f5e8c1d9
commit
7e43bcc114
1 changed files with 15 additions and 19 deletions
|
|
@ -16,10 +16,8 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons {
|
||||||
private boolean isTextEditingActive() { return tt9 != null && tt9.isTextEditingActive(); }
|
private boolean isTextEditingActive() { return tt9 != null && tt9.isTextEditingActive(); }
|
||||||
private boolean isTextEditingMissing() { return tt9 != null && tt9.isInputLimited(); }
|
private boolean isTextEditingMissing() { return tt9 != null && tt9.isInputLimited(); }
|
||||||
|
|
||||||
|
private boolean isKeySmall() {
|
||||||
@Override
|
return getTT9Height() < 0.8f && getTT9Width() < 0.7f;
|
||||||
protected float getTitleScale() {
|
|
||||||
return super.getTitleScale() / 0.85f;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -53,20 +51,6 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected String getTitle() {
|
|
||||||
if (isTextEditingActive() || isVoiceInputActive()) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isTextEditingMissing() && !isVoiceInputMissing()) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
return "✂";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getCentralIcon() {
|
protected int getCentralIcon() {
|
||||||
if (isTextEditingActive()) {
|
if (isTextEditingActive()) {
|
||||||
|
|
@ -77,7 +61,18 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons {
|
||||||
return R.drawable.ic_fn_voice_off;
|
return R.drawable.ic_fn_voice_off;
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return R.drawable.ic_txt_cut;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected float getCentralIconScale() {
|
||||||
|
float scale = 1;
|
||||||
|
if (!isVoiceInputActive() && !isTextEditingActive() && !isTextEditingMissing()) {
|
||||||
|
scale = isKeySmall() ? 0.7f : 0.8f;
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.getCentralIconScale() * scale;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -90,6 +85,7 @@ public class SoftKeyRF3 extends BaseSoftKeyWithIcons {
|
||||||
return R.drawable.ic_fn_voice;
|
return R.drawable.ic_fn_voice;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render() {
|
public void render() {
|
||||||
resetIconCache();
|
resetIconCache();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue