Skip to content

Commit 7653e63

Browse files
mikeNGmikeNG
committed
Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20
Android 15.0.0 Release 20 (BP1A.250305.019) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8epZAAKCRDorT+BmrEO # eFOwAJ9OgZjpf4Doqz3WZBR3Vgw2OTHNIQCeKX5MTP4i+vq/vZXj7Q2k6rLWlrs= # =AZOh # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 5 03:31:16 2025 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <[email protected]>" [ultimate] * tag 'android-15.0.0_r20': Fix bug: AOSP keyboard is shown incompletely in Android V landscape mode Fully qualify @attr reference to android.R field Use jni_libs to install shared library dependency Conflicts: java/src/com/android/inputmethod/keyboard/KeyboardView.java Change-Id: I870166255c5e5efa54ed685d1d81bd532fc9cd2d
2 parents a27d7ed + a424134 commit 7653e63

8 files changed

+101
-101
lines changed

‎java/src/com/android/inputmethod/keyboard/KeyboardView.java

+31-31
Original file line numberDiff line numberDiff line change
@@ -47,37 +47,37 @@
4747
/**
4848
* A view that renders a virtual {@link Keyboard}.
4949
*
50-
* @attr ref R.styleable#KeyboardView_keyBackground
51-
* @attr ref R.styleable#KeyboardView_functionalKeyBackground
52-
* @attr ref R.styleable#KeyboardView_spacebarBackground
53-
* @attr ref R.styleable#KeyboardView_spacebarIconWidthRatio
54-
* @attr ref R.styleable#Keyboard_Key_keyLabelFlags
55-
* @attr ref R.styleable#KeyboardView_keyHintLetterPadding
56-
* @attr ref R.styleable#KeyboardView_keyHintLetterPaddingVertical
57-
* @attr ref R.styleable#KeyboardView_keyPopupHintLetter
58-
* @attr ref R.styleable#KeyboardView_keyPopupHintLetterPadding
59-
* @attr ref R.styleable#KeyboardView_keyShiftedLetterHintPadding
60-
* @attr ref R.styleable#KeyboardView_keyTextShadowRadius
61-
* @attr ref R.styleable#KeyboardView_verticalCorrection
62-
* @attr ref R.styleable#Keyboard_Key_keyTypeface
63-
* @attr ref R.styleable#Keyboard_Key_keyLetterSize
64-
* @attr ref R.styleable#Keyboard_Key_keyLabelSize
65-
* @attr ref R.styleable#Keyboard_Key_keyLargeLetterRatio
66-
* @attr ref R.styleable#Keyboard_Key_keyLargeLabelRatio
67-
* @attr ref R.styleable#Keyboard_Key_keyHintLetterRatio
68-
* @attr ref R.styleable#Keyboard_Key_keyShiftedLetterHintRatio
69-
* @attr ref R.styleable#Keyboard_Key_keyHintLabelRatio
70-
* @attr ref R.styleable#Keyboard_Key_keyLabelOffCenterRatio
71-
* @attr ref R.styleable#Keyboard_Key_keyHintLabelOffCenterRatio
72-
* @attr ref R.styleable#Keyboard_Key_keyPreviewTextRatio
73-
* @attr ref R.styleable#Keyboard_Key_keyTextColor
74-
* @attr ref R.styleable#Keyboard_Key_keyTextColorDisabled
75-
* @attr ref R.styleable#Keyboard_Key_keyTextShadowColor
76-
* @attr ref R.styleable#Keyboard_Key_keyHintLetterColor
77-
* @attr ref R.styleable#Keyboard_Key_keyHintLabelColor
78-
* @attr ref R.styleable#Keyboard_Key_keyShiftedLetterHintInactivatedColor
79-
* @attr ref R.styleable#Keyboard_Key_keyShiftedLetterHintActivatedColor
80-
* @attr ref R.styleable#Keyboard_Key_keyPreviewTextColor
50+
* @attr ref android.R.styleable#KeyboardView_keyBackground
51+
* @attr ref android.R.styleable#KeyboardView_functionalKeyBackground
52+
* @attr ref android.R.styleable#KeyboardView_spacebarBackground
53+
* @attr ref android.R.styleable#KeyboardView_spacebarIconWidthRatio
54+
* @attr ref android.R.styleable#Keyboard_Key_keyLabelFlags
55+
* @attr ref android.R.styleable#KeyboardView_keyHintLetterPadding
56+
* @attr ref android.R.styleable#KeyboardView_keyHintLetterPaddingVertical
57+
* @attr ref android.R.styleable#KeyboardView_keyPopupHintLetter
58+
* @attr ref android.R.styleable#KeyboardView_keyPopupHintLetterPadding
59+
* @attr ref android.R.styleable#KeyboardView_keyShiftedLetterHintPadding
60+
* @attr ref android.R.styleable#KeyboardView_keyTextShadowRadius
61+
* @attr ref android.R.styleable#KeyboardView_verticalCorrection
62+
* @attr ref android.R.styleable#Keyboard_Key_keyTypeface
63+
* @attr ref android.R.styleable#Keyboard_Key_keyLetterSize
64+
* @attr ref android.R.styleable#Keyboard_Key_keyLabelSize
65+
* @attr ref android.R.styleable#Keyboard_Key_keyLargeLetterRatio
66+
* @attr ref android.R.styleable#Keyboard_Key_keyLargeLabelRatio
67+
* @attr ref android.R.styleable#Keyboard_Key_keyHintLetterRatio
68+
* @attr ref android.R.styleable#Keyboard_Key_keyShiftedLetterHintRatio
69+
* @attr ref android.R.styleable#Keyboard_Key_keyHintLabelRatio
70+
* @attr ref android.R.styleable#Keyboard_Key_keyLabelOffCenterRatio
71+
* @attr ref android.R.styleable#Keyboard_Key_keyHintLabelOffCenterRatio
72+
* @attr ref android.R.styleable#Keyboard_Key_keyPreviewTextRatio
73+
* @attr ref android.R.styleable#Keyboard_Key_keyTextColor
74+
* @attr ref android.R.styleable#Keyboard_Key_keyTextColorDisabled
75+
* @attr ref android.R.styleable#Keyboard_Key_keyTextShadowColor
76+
* @attr ref android.R.styleable#Keyboard_Key_keyHintLetterColor
77+
* @attr ref android.R.styleable#Keyboard_Key_keyHintLabelColor
78+
* @attr ref android.R.styleable#Keyboard_Key_keyShiftedLetterHintInactivatedColor
79+
* @attr ref android.R.styleable#Keyboard_Key_keyShiftedLetterHintActivatedColor
80+
* @attr ref android.R.styleable#Keyboard_Key_keyPreviewTextColor
8181
*/
8282
public class KeyboardView extends View {
8383
// XML attributes

‎java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

+39-39
Original file line numberDiff line numberDiff line change
@@ -69,45 +69,45 @@
6969
/**
7070
* A view that is responsible for detecting key presses and touch movements.
7171
*
72-
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextRatio
73-
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextColor
74-
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextShadowRadius
75-
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextShadowColor
76-
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFinalAlpha
77-
* @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFadeoutAnimator
78-
* @attr ref R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeoutAnimator
79-
* @attr ref R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeinAnimator
80-
* @attr ref R.styleable#MainKeyboardView_keyHysteresisDistance
81-
* @attr ref R.styleable#MainKeyboardView_touchNoiseThresholdTime
82-
* @attr ref R.styleable#MainKeyboardView_touchNoiseThresholdDistance
83-
* @attr ref R.styleable#MainKeyboardView_keySelectionByDraggingFinger
84-
* @attr ref R.styleable#MainKeyboardView_keyRepeatStartTimeout
85-
* @attr ref R.styleable#MainKeyboardView_keyRepeatInterval
86-
* @attr ref R.styleable#MainKeyboardView_longPressKeyTimeout
87-
* @attr ref R.styleable#MainKeyboardView_longPressShiftKeyTimeout
88-
* @attr ref R.styleable#MainKeyboardView_ignoreAltCodeKeyTimeout
89-
* @attr ref R.styleable#MainKeyboardView_keyPreviewLayout
90-
* @attr ref R.styleable#MainKeyboardView_keyPreviewOffset
91-
* @attr ref R.styleable#MainKeyboardView_keyPreviewHeight
92-
* @attr ref R.styleable#MainKeyboardView_keyPreviewLingerTimeout
93-
* @attr ref R.styleable#MainKeyboardView_keyPreviewShowUpAnimator
94-
* @attr ref R.styleable#MainKeyboardView_keyPreviewDismissAnimator
95-
* @attr ref R.styleable#MainKeyboardView_moreKeysKeyboardLayout
96-
* @attr ref R.styleable#MainKeyboardView_moreKeysKeyboardForActionLayout
97-
* @attr ref R.styleable#MainKeyboardView_backgroundDimAlpha
98-
* @attr ref R.styleable#MainKeyboardView_showMoreKeysKeyboardAtTouchPoint
99-
* @attr ref R.styleable#MainKeyboardView_gestureFloatingPreviewTextLingerTimeout
100-
* @attr ref R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping
101-
* @attr ref R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold
102-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration
103-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom
104-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo
105-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom
106-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo
107-
* @attr ref R.styleable#MainKeyboardView_gestureSamplingMinimumDistance
108-
* @attr ref R.styleable#MainKeyboardView_gestureRecognitionMinimumTime
109-
* @attr ref R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold
110-
* @attr ref R.styleable#MainKeyboardView_suppressKeyPreviewAfterBatchInputDuration
72+
* @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextRatio
73+
* @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextColor
74+
* @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextShadowRadius
75+
* @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextShadowColor
76+
* @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarFinalAlpha
77+
* @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarFadeoutAnimator
78+
* @attr ref android.R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeoutAnimator
79+
* @attr ref android.R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeinAnimator
80+
* @attr ref android.R.styleable#MainKeyboardView_keyHysteresisDistance
81+
* @attr ref android.R.styleable#MainKeyboardView_touchNoiseThresholdTime
82+
* @attr ref android.R.styleable#MainKeyboardView_touchNoiseThresholdDistance
83+
* @attr ref android.R.styleable#MainKeyboardView_keySelectionByDraggingFinger
84+
* @attr ref android.R.styleable#MainKeyboardView_keyRepeatStartTimeout
85+
* @attr ref android.R.styleable#MainKeyboardView_keyRepeatInterval
86+
* @attr ref android.R.styleable#MainKeyboardView_longPressKeyTimeout
87+
* @attr ref android.R.styleable#MainKeyboardView_longPressShiftKeyTimeout
88+
* @attr ref android.R.styleable#MainKeyboardView_ignoreAltCodeKeyTimeout
89+
* @attr ref android.R.styleable#MainKeyboardView_keyPreviewLayout
90+
* @attr ref android.R.styleable#MainKeyboardView_keyPreviewOffset
91+
* @attr ref android.R.styleable#MainKeyboardView_keyPreviewHeight
92+
* @attr ref android.R.styleable#MainKeyboardView_keyPreviewLingerTimeout
93+
* @attr ref android.R.styleable#MainKeyboardView_keyPreviewShowUpAnimator
94+
* @attr ref android.R.styleable#MainKeyboardView_keyPreviewDismissAnimator
95+
* @attr ref android.R.styleable#MainKeyboardView_moreKeysKeyboardLayout
96+
* @attr ref android.R.styleable#MainKeyboardView_moreKeysKeyboardForActionLayout
97+
* @attr ref android.R.styleable#MainKeyboardView_backgroundDimAlpha
98+
* @attr ref android.R.styleable#MainKeyboardView_showMoreKeysKeyboardAtTouchPoint
99+
* @attr ref android.R.styleable#MainKeyboardView_gestureFloatingPreviewTextLingerTimeout
100+
* @attr ref android.R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping
101+
* @attr ref android.R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold
102+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration
103+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom
104+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo
105+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom
106+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo
107+
* @attr ref android.R.styleable#MainKeyboardView_gestureSamplingMinimumDistance
108+
* @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionMinimumTime
109+
* @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold
110+
* @attr ref android.R.styleable#MainKeyboardView_suppressKeyPreviewAfterBatchInputDuration
111111
*/
112112
public final class MainKeyboardView extends KeyboardView implements DrawingProxy,
113113
MoreKeysPanel.Controller {

‎java/src/com/android/inputmethod/keyboard/internal/GestureFloatingTextDrawingPreview.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
* The class for single gesture preview text. The class for multiple gesture preview text will be
3636
* derived from it.
3737
*
38-
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextSize
39-
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextColor
40-
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextOffset
41-
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewColor
42-
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewHorizontalPadding
43-
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewVerticalPadding
44-
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewRoundRadius
38+
* @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewTextSize
39+
* @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewTextColor
40+
* @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewTextOffset
41+
* @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewColor
42+
* @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewHorizontalPadding
43+
* @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewVerticalPadding
44+
* @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewRoundRadius
4545
*/
4646
public class GestureFloatingTextDrawingPreview extends AbstractDrawingPreview {
4747
protected static final class GesturePreviewTextParams {

‎java/src/com/android/inputmethod/keyboard/internal/GestureStrokeDrawingParams.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
/**
2424
* This class holds parameters to control how a gesture stroke is sampled and drawn on the screen.
2525
*
26-
* @attr ref R.styleable#MainKeyboardView_gestureTrailMinSamplingDistance
27-
* @attr ref R.styleable#MainKeyboardView_gestureTrailMaxInterpolationAngularThreshold
28-
* @attr ref R.styleable#MainKeyboardView_gestureTrailMaxInterpolationDistanceThreshold
29-
* @attr ref R.styleable#MainKeyboardView_gestureTrailMaxInterpolationSegments
26+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailMinSamplingDistance
27+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailMaxInterpolationAngularThreshold
28+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailMaxInterpolationDistanceThreshold
29+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailMaxInterpolationSegments
3030
*/
3131
public final class GestureStrokeDrawingParams {
3232
public final double mMinSamplingDistance; // in pixel

‎java/src/com/android/inputmethod/keyboard/internal/GestureStrokeRecognitionParams.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
* This class holds parameters to control how a gesture stroke is sampled and recognized.
2626
* This class also has parameters to distinguish gesture input events from fast typing events.
2727
*
28-
* @attr ref R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping
29-
* @attr ref R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold
30-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration
31-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom
32-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo
33-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom
34-
* @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo
35-
* @attr ref R.styleable#MainKeyboardView_gestureSamplingMinimumDistance
36-
* @attr ref R.styleable#MainKeyboardView_gestureRecognitionMinimumTime
37-
* @attr ref R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold
28+
* @attr ref android.R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping
29+
* @attr ref android.R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold
30+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration
31+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom
32+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo
33+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom
34+
* @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo
35+
* @attr ref android.R.styleable#MainKeyboardView_gestureSamplingMinimumDistance
36+
* @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionMinimumTime
37+
* @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold
3838
*/
3939
public final class GestureStrokeRecognitionParams {
4040
// Static threshold for gesture after fast typing

‎java/src/com/android/inputmethod/keyboard/internal/GestureTrailDrawingParams.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
* sampled and interpolated. This class controls how those gesture strokes are displayed as a
2828
* gesture trail and animated on the screen.
2929
*
30-
* @attr ref R.styleable#MainKeyboardView_gestureTrailFadeoutStartDelay
31-
* @attr ref R.styleable#MainKeyboardView_gestureTrailFadeoutDuration
32-
* @attr ref R.styleable#MainKeyboardView_gestureTrailUpdateInterval
33-
* @attr ref R.styleable#MainKeyboardView_gestureTrailColor
34-
* @attr ref R.styleable#MainKeyboardView_gestureTrailWidth
30+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailFadeoutStartDelay
31+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailFadeoutDuration
32+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailUpdateInterval
33+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailColor
34+
* @attr ref android.R.styleable#MainKeyboardView_gestureTrailWidth
3535
*/
3636
final class GestureTrailDrawingParams {
3737
private static final int FADEOUT_START_DELAY_FOR_DEBUG = 2000; // millisecond

‎java/src/com/android/inputmethod/keyboard/internal/SlidingKeyInputDrawingPreview.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
/**
2929
* Draw rubber band preview graphics during sliding key input.
3030
*
31-
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewColor
32-
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewWidth
33-
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewBodyRatio
34-
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewShadowRatio
31+
* @attr ref android.R.styleable#MainKeyboardView_slidingKeyInputPreviewColor
32+
* @attr ref android.R.styleable#MainKeyboardView_slidingKeyInputPreviewWidth
33+
* @attr ref android.R.styleable#MainKeyboardView_slidingKeyInputPreviewBodyRatio
34+
* @attr ref android.R.styleable#MainKeyboardView_slidingKeyInputPreviewShadowRatio
3535
*/
3636
public final class SlidingKeyInputDrawingPreview extends AbstractDrawingPreview {
3737
private final float mPreviewBodyRadius;

‎tools/dicttool/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ java_binary_host {
3636
"jsr305",
3737
"latinime-common",
3838
],
39-
required: ["libjni_latinime"],
39+
jni_libs: ["libjni_latinime"],
4040
main_class: "com.android.inputmethod.latin.dicttool.Dicttool",
4141
}

0 commit comments

Comments
 (0)