Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19233360 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Fully qualify @attr reference to android.R field" into main

parents 2c0f50b0 24e7ea35

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

+30 −30
Original line number Original line Diff line number Diff line
@@ -46,36 +46,36 @@ import javax.annotation.Nullable; 
/**

/**

 * A view that renders a virtual {@link Keyboard}.

 * A view that renders a virtual {@link Keyboard}.

 *

 *

 * @attr ref R.styleable#KeyboardView_keyBackground

 * @attr ref android.R.styleable#KeyboardView_keyBackground

 * @attr ref R.styleable#KeyboardView_functionalKeyBackground

 * @attr ref android.R.styleable#KeyboardView_functionalKeyBackground

 * @attr ref R.styleable#KeyboardView_spacebarBackground

 * @attr ref android.R.styleable#KeyboardView_spacebarBackground

 * @attr ref R.styleable#KeyboardView_spacebarIconWidthRatio

 * @attr ref android.R.styleable#KeyboardView_spacebarIconWidthRatio

 * @attr ref R.styleable#Keyboard_Key_keyLabelFlags

 * @attr ref android.R.styleable#Keyboard_Key_keyLabelFlags

 * @attr ref R.styleable#KeyboardView_keyHintLetterPadding

 * @attr ref android.R.styleable#KeyboardView_keyHintLetterPadding

 * @attr ref R.styleable#KeyboardView_keyPopupHintLetter

 * @attr ref android.R.styleable#KeyboardView_keyPopupHintLetter

 * @attr ref R.styleable#KeyboardView_keyPopupHintLetterPadding

 * @attr ref android.R.styleable#KeyboardView_keyPopupHintLetterPadding

 * @attr ref R.styleable#KeyboardView_keyShiftedLetterHintPadding

 * @attr ref android.R.styleable#KeyboardView_keyShiftedLetterHintPadding

 * @attr ref R.styleable#KeyboardView_keyTextShadowRadius

 * @attr ref android.R.styleable#KeyboardView_keyTextShadowRadius

 * @attr ref R.styleable#KeyboardView_verticalCorrection

 * @attr ref android.R.styleable#KeyboardView_verticalCorrection

 * @attr ref R.styleable#Keyboard_Key_keyTypeface

 * @attr ref android.R.styleable#Keyboard_Key_keyTypeface

 * @attr ref R.styleable#Keyboard_Key_keyLetterSize

 * @attr ref android.R.styleable#Keyboard_Key_keyLetterSize

 * @attr ref R.styleable#Keyboard_Key_keyLabelSize

 * @attr ref android.R.styleable#Keyboard_Key_keyLabelSize

 * @attr ref R.styleable#Keyboard_Key_keyLargeLetterRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyLargeLetterRatio

 * @attr ref R.styleable#Keyboard_Key_keyLargeLabelRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyLargeLabelRatio

 * @attr ref R.styleable#Keyboard_Key_keyHintLetterRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyHintLetterRatio

 * @attr ref R.styleable#Keyboard_Key_keyShiftedLetterHintRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyShiftedLetterHintRatio

 * @attr ref R.styleable#Keyboard_Key_keyHintLabelRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyHintLabelRatio

 * @attr ref R.styleable#Keyboard_Key_keyLabelOffCenterRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyLabelOffCenterRatio

 * @attr ref R.styleable#Keyboard_Key_keyHintLabelOffCenterRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyHintLabelOffCenterRatio

 * @attr ref R.styleable#Keyboard_Key_keyPreviewTextRatio

 * @attr ref android.R.styleable#Keyboard_Key_keyPreviewTextRatio

 * @attr ref R.styleable#Keyboard_Key_keyTextColor

 * @attr ref android.R.styleable#Keyboard_Key_keyTextColor

 * @attr ref R.styleable#Keyboard_Key_keyTextColorDisabled

 * @attr ref android.R.styleable#Keyboard_Key_keyTextColorDisabled

 * @attr ref R.styleable#Keyboard_Key_keyTextShadowColor

 * @attr ref android.R.styleable#Keyboard_Key_keyTextShadowColor

 * @attr ref R.styleable#Keyboard_Key_keyHintLetterColor

 * @attr ref android.R.styleable#Keyboard_Key_keyHintLetterColor

 * @attr ref R.styleable#Keyboard_Key_keyHintLabelColor

 * @attr ref android.R.styleable#Keyboard_Key_keyHintLabelColor

 * @attr ref R.styleable#Keyboard_Key_keyShiftedLetterHintInactivatedColor

 * @attr ref android.R.styleable#Keyboard_Key_keyShiftedLetterHintInactivatedColor

 * @attr ref R.styleable#Keyboard_Key_keyShiftedLetterHintActivatedColor

 * @attr ref android.R.styleable#Keyboard_Key_keyShiftedLetterHintActivatedColor

 * @attr ref R.styleable#Keyboard_Key_keyPreviewTextColor

 * @attr ref android.R.styleable#Keyboard_Key_keyPreviewTextColor

 */

 */

public class KeyboardView extends View {

public class KeyboardView extends View {

    // XML attributes

    // XML attributes

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

+39 −39
Original line number Original line Diff line number Diff line
@@ -69,45 +69,45 @@ import javax.annotation.Nullable; 
/**

/**

 * A view that is responsible for detecting key presses and touch movements.

 * A view that is responsible for detecting key presses and touch movements.

 *

 *

 * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextRatio

 * @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextRatio

 * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextColor

 * @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextColor

 * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextShadowRadius

 * @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextShadowRadius

 * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarTextShadowColor

 * @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarTextShadowColor

 * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFinalAlpha

 * @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarFinalAlpha

 * @attr ref R.styleable#MainKeyboardView_languageOnSpacebarFadeoutAnimator

 * @attr ref android.R.styleable#MainKeyboardView_languageOnSpacebarFadeoutAnimator

 * @attr ref R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeoutAnimator

 * @attr ref android.R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeoutAnimator

 * @attr ref R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeinAnimator

 * @attr ref android.R.styleable#MainKeyboardView_altCodeKeyWhileTypingFadeinAnimator

 * @attr ref R.styleable#MainKeyboardView_keyHysteresisDistance

 * @attr ref android.R.styleable#MainKeyboardView_keyHysteresisDistance

 * @attr ref R.styleable#MainKeyboardView_touchNoiseThresholdTime

 * @attr ref android.R.styleable#MainKeyboardView_touchNoiseThresholdTime

 * @attr ref R.styleable#MainKeyboardView_touchNoiseThresholdDistance

 * @attr ref android.R.styleable#MainKeyboardView_touchNoiseThresholdDistance

 * @attr ref R.styleable#MainKeyboardView_keySelectionByDraggingFinger

 * @attr ref android.R.styleable#MainKeyboardView_keySelectionByDraggingFinger

 * @attr ref R.styleable#MainKeyboardView_keyRepeatStartTimeout

 * @attr ref android.R.styleable#MainKeyboardView_keyRepeatStartTimeout

 * @attr ref R.styleable#MainKeyboardView_keyRepeatInterval

 * @attr ref android.R.styleable#MainKeyboardView_keyRepeatInterval

 * @attr ref R.styleable#MainKeyboardView_longPressKeyTimeout

 * @attr ref android.R.styleable#MainKeyboardView_longPressKeyTimeout

 * @attr ref R.styleable#MainKeyboardView_longPressShiftKeyTimeout

 * @attr ref android.R.styleable#MainKeyboardView_longPressShiftKeyTimeout

 * @attr ref R.styleable#MainKeyboardView_ignoreAltCodeKeyTimeout

 * @attr ref android.R.styleable#MainKeyboardView_ignoreAltCodeKeyTimeout

 * @attr ref R.styleable#MainKeyboardView_keyPreviewLayout

 * @attr ref android.R.styleable#MainKeyboardView_keyPreviewLayout

 * @attr ref R.styleable#MainKeyboardView_keyPreviewOffset

 * @attr ref android.R.styleable#MainKeyboardView_keyPreviewOffset

 * @attr ref R.styleable#MainKeyboardView_keyPreviewHeight

 * @attr ref android.R.styleable#MainKeyboardView_keyPreviewHeight

 * @attr ref R.styleable#MainKeyboardView_keyPreviewLingerTimeout

 * @attr ref android.R.styleable#MainKeyboardView_keyPreviewLingerTimeout

 * @attr ref R.styleable#MainKeyboardView_keyPreviewShowUpAnimator

 * @attr ref android.R.styleable#MainKeyboardView_keyPreviewShowUpAnimator

 * @attr ref R.styleable#MainKeyboardView_keyPreviewDismissAnimator

 * @attr ref android.R.styleable#MainKeyboardView_keyPreviewDismissAnimator

 * @attr ref R.styleable#MainKeyboardView_moreKeysKeyboardLayout

 * @attr ref android.R.styleable#MainKeyboardView_moreKeysKeyboardLayout

 * @attr ref R.styleable#MainKeyboardView_moreKeysKeyboardForActionLayout

 * @attr ref android.R.styleable#MainKeyboardView_moreKeysKeyboardForActionLayout

 * @attr ref R.styleable#MainKeyboardView_backgroundDimAlpha

 * @attr ref android.R.styleable#MainKeyboardView_backgroundDimAlpha

 * @attr ref R.styleable#MainKeyboardView_showMoreKeysKeyboardAtTouchPoint

 * @attr ref android.R.styleable#MainKeyboardView_showMoreKeysKeyboardAtTouchPoint

 * @attr ref R.styleable#MainKeyboardView_gestureFloatingPreviewTextLingerTimeout

 * @attr ref android.R.styleable#MainKeyboardView_gestureFloatingPreviewTextLingerTimeout

 * @attr ref R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping

 * @attr ref android.R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping

 * @attr ref R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold

 * @attr ref android.R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo

 * @attr ref R.styleable#MainKeyboardView_gestureSamplingMinimumDistance

 * @attr ref android.R.styleable#MainKeyboardView_gestureSamplingMinimumDistance

 * @attr ref R.styleable#MainKeyboardView_gestureRecognitionMinimumTime

 * @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionMinimumTime

 * @attr ref R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold

 * @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold

 * @attr ref R.styleable#MainKeyboardView_suppressKeyPreviewAfterBatchInputDuration

 * @attr ref android.R.styleable#MainKeyboardView_suppressKeyPreviewAfterBatchInputDuration

 */

 */

public final class MainKeyboardView extends KeyboardView implements DrawingProxy,

public final class MainKeyboardView extends KeyboardView implements DrawingProxy,

        MoreKeysPanel.Controller {

        MoreKeysPanel.Controller {

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -35,13 +35,13 @@ import javax.annotation.Nonnull; 
 * The class for single gesture preview text. The class for multiple gesture preview text will be

 * The class for single gesture preview text. The class for multiple gesture preview text will be

 * derived from it.

 * derived from it.

 *

 *

 * @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextSize

 * @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewTextSize

 * @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextColor

 * @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewTextColor

 * @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextOffset

 * @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewTextOffset

 * @attr ref R.styleable#KeyboardView_gestureFloatingPreviewColor

 * @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewColor

 * @attr ref R.styleable#KeyboardView_gestureFloatingPreviewHorizontalPadding

 * @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewHorizontalPadding

 * @attr ref R.styleable#KeyboardView_gestureFloatingPreviewVerticalPadding

 * @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewVerticalPadding

 * @attr ref R.styleable#KeyboardView_gestureFloatingPreviewRoundRadius

 * @attr ref android.R.styleable#KeyboardView_gestureFloatingPreviewRoundRadius

 */

 */

public class GestureFloatingTextDrawingPreview extends AbstractDrawingPreview {

public class GestureFloatingTextDrawingPreview extends AbstractDrawingPreview {

    protected static final class GesturePreviewTextParams {

    protected static final class GesturePreviewTextParams {

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -23,10 +23,10 @@ import com.android.inputmethod.latin.R; 
/**

/**

 * This class holds parameters to control how a gesture stroke is sampled and drawn on the screen.

 * This class holds parameters to control how a gesture stroke is sampled and drawn on the screen.

 *

 *

 * @attr ref R.styleable#MainKeyboardView_gestureTrailMinSamplingDistance

 * @attr ref android.R.styleable#MainKeyboardView_gestureTrailMinSamplingDistance

 * @attr ref R.styleable#MainKeyboardView_gestureTrailMaxInterpolationAngularThreshold

 * @attr ref android.R.styleable#MainKeyboardView_gestureTrailMaxInterpolationAngularThreshold

 * @attr ref R.styleable#MainKeyboardView_gestureTrailMaxInterpolationDistanceThreshold

 * @attr ref android.R.styleable#MainKeyboardView_gestureTrailMaxInterpolationDistanceThreshold

 * @attr ref R.styleable#MainKeyboardView_gestureTrailMaxInterpolationSegments

 * @attr ref android.R.styleable#MainKeyboardView_gestureTrailMaxInterpolationSegments

 */

 */

public final class GestureStrokeDrawingParams {

public final class GestureStrokeDrawingParams {

    public final double mMinSamplingDistance; // in pixel

    public final double mMinSamplingDistance; // in pixel

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

+10 −10
Original line number Original line Diff line number Diff line
@@ -25,16 +25,16 @@ import com.android.inputmethod.latin.utils.ResourceUtils; 
 * This class holds parameters to control how a gesture stroke is sampled and recognized.

 * This class holds parameters to control how a gesture stroke is sampled and recognized.

 * This class also has parameters to distinguish gesture input events from fast typing events.

 * This class also has parameters to distinguish gesture input events from fast typing events.

 *

 *

 * @attr ref R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping

 * @attr ref android.R.styleable#MainKeyboardView_gestureStaticTimeThresholdAfterFastTyping

 * @attr ref R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold

 * @attr ref android.R.styleable#MainKeyboardView_gestureDetectFastMoveSpeedThreshold

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicThresholdDecayDuration

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdFrom

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicTimeThresholdTo

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdFrom

 * @attr ref R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo

 * @attr ref android.R.styleable#MainKeyboardView_gestureDynamicDistanceThresholdTo

 * @attr ref R.styleable#MainKeyboardView_gestureSamplingMinimumDistance

 * @attr ref android.R.styleable#MainKeyboardView_gestureSamplingMinimumDistance

 * @attr ref R.styleable#MainKeyboardView_gestureRecognitionMinimumTime

 * @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionMinimumTime

 * @attr ref R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold

 * @attr ref android.R.styleable#MainKeyboardView_gestureRecognitionSpeedThreshold

 */

 */

public final class GestureStrokeRecognitionParams {

public final class GestureStrokeRecognitionParams {

    // Static threshold for gesture after fast typing

    // Static threshold for gesture after fast typing