mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-06-08 07:37:41 +00:00
remove legacy devices keyboard heights
This commit is contained in:
parent
bc7af4f2ab
commit
90ae4c8aec
4 changed files with 22 additions and 15 deletions
|
@ -198,14 +198,7 @@ public final class ResourceUtils {
|
||||||
|
|
||||||
public static int getDefaultKeyboardHeight(final Resources res) {
|
public static int getDefaultKeyboardHeight(final Resources res) {
|
||||||
final DisplayMetrics dm = res.getDisplayMetrics();
|
final DisplayMetrics dm = res.getDisplayMetrics();
|
||||||
final String keyboardHeightInDp = getDeviceOverrideValue(
|
final float keyboardHeight = res.getDimension(R.dimen.config_default_keyboard_height);
|
||||||
res, R.array.keyboard_heights, null /* defaultValue */);
|
|
||||||
final float keyboardHeight;
|
|
||||||
if (TextUtils.isEmpty(keyboardHeightInDp)) {
|
|
||||||
keyboardHeight = res.getDimension(R.dimen.config_default_keyboard_height);
|
|
||||||
} else {
|
|
||||||
keyboardHeight = Float.parseFloat(keyboardHeightInDp) * dm.density;
|
|
||||||
}
|
|
||||||
final float maxKeyboardHeight = res.getFraction(
|
final float maxKeyboardHeight = res.getFraction(
|
||||||
R.fraction.config_max_keyboard_height, dm.heightPixels, dm.heightPixels);
|
R.fraction.config_max_keyboard_height, dm.heightPixels, dm.heightPixels);
|
||||||
float minKeyboardHeight = res.getFraction(
|
float minKeyboardHeight = res.getFraction(
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="rectangle">
|
||||||
|
<solid
|
||||||
|
android:color="#F6F8FA" />
|
||||||
|
<size
|
||||||
|
android:height="5dp"
|
||||||
|
android:width="40dp"/>
|
||||||
|
<padding android:left="5dp"
|
||||||
|
android:top="5dp"
|
||||||
|
android:right="5dp"
|
||||||
|
android:bottom="60dp" />
|
||||||
|
<corners android:radius="5dp" />
|
||||||
|
</shape>
|
|
@ -20,17 +20,17 @@
|
||||||
>
|
>
|
||||||
<!-- Left edge -->
|
<!-- Left edge -->
|
||||||
<item latin:state_left_edge="true" latin:state_has_morekeys="true"
|
<item latin:state_left_edge="true" latin:state_has_morekeys="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" />
|
android:drawable="@drawable/keyboard_key_feedback_background_lxx_light_border" />
|
||||||
<item latin:state_left_edge="true"
|
<item latin:state_left_edge="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" />
|
android:drawable="@drawable/keyboard_key_feedback_background_lxx_light_border" />
|
||||||
|
|
||||||
<!-- Right edge -->
|
<!-- Right edge -->
|
||||||
<item latin:state_right_edge="true" latin:state_has_morekeys="true"
|
<item latin:state_right_edge="true" latin:state_has_morekeys="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" />
|
android:drawable="@drawable/keyboard_key_feedback_background_lxx_light_border" />
|
||||||
<item latin:state_right_edge="true"
|
<item latin:state_right_edge="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" />
|
android:drawable="@drawable/keyboard_key_feedback_background_lxx_light_border" />
|
||||||
|
|
||||||
<item latin:state_has_morekeys="true"
|
<item latin:state_has_morekeys="true"
|
||||||
android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" />
|
android:drawable="@drawable/keyboard_key_feedback_background_lxx_light_border" />
|
||||||
<item android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" />
|
<item android:drawable="@drawable/keyboard_key_feedback_background_lxx_light_border" />
|
||||||
</selector>
|
</selector>
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
<fraction name="config_key_horizontal_gap_holo">1.739%p</fraction>
|
<fraction name="config_key_horizontal_gap_holo">1.739%p</fraction>
|
||||||
<!-- config_more_keys_keyboard_key_height x -0.5 -->
|
<!-- config_more_keys_keyboard_key_height x -0.5 -->
|
||||||
<dimen name="config_more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
|
<dimen name="config_more_keys_keyboard_vertical_correction_holo">-26.4dp</dimen>
|
||||||
<dimen name="config_key_preview_offset_holo">30.0dp</dimen>
|
<dimen name="config_key_preview_offset_holo">40.0dp</dimen>
|
||||||
<dimen name="config_key_preview_height_holo">80dp</dimen>
|
<dimen name="config_key_preview_height_holo">80dp</dimen>
|
||||||
<dimen name="config_key_preview_offset_lxx">0dp</dimen>
|
<dimen name="config_key_preview_offset_lxx">0dp</dimen>
|
||||||
<dimen name="config_key_preview_height_lxx">111dp</dimen>
|
<dimen name="config_key_preview_height_lxx">111dp</dimen>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue