Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LatinIME
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
keyboard
LatinIME
Commits
34f18203
Commit
34f18203
authored
13 years ago
by
Tadashi G. Takaoka
Browse files
Options
Downloads
Patches
Plain Diff
Remove KeyboardSwitcher.updateShiftLockState method
Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
parent
dc52e7c6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+7
-15
7 additions, 15 deletions
...rc/com/android/inputmethod/keyboard/KeyboardSwitcher.java
with
7 additions
and
15 deletions
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+
7
−
15
View file @
34f18203
...
...
@@ -168,7 +168,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
final
Keyboard
oldKeyboard
=
mKeyboardView
.
getKeyboard
();
mKeyboardView
.
setKeyboard
(
keyboard
);
mCurrentInputView
.
setKeyboardGeometry
(
keyboard
.
mTopPadding
);
updateShiftLockState
(
keyboard
);
mKeyboardView
.
setKeyPreviewPopupEnabled
(
SettingsValues
.
isKeyPreviewPopupEnabled
(
mPrefs
,
mResources
),
SettingsValues
.
getKeyPreviewPopupDismissDelay
(
mPrefs
,
mResources
));
...
...
@@ -178,19 +177,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
updateShiftState
();
}
private
void
updateShiftLockState
(
Keyboard
keyboard
)
{
if
(
keyboard
.
mId
.
equals
(
mSymbolsShiftedKeyboardId
))
{
// Symbol keyboard may have an ALT key that has a caps lock style indicator (a.k.a.
// sticky shift key). To show or dismiss the indicator, we need to call setShiftLocked()
// that takes care of the current keyboard having such ALT key or not.
keyboard
.
setShiftLocked
(
keyboard
.
hasShiftLockKey
());
}
else
if
(
keyboard
.
mId
.
equals
(
mSymbolsKeyboardId
))
{
// Symbol keyboard has an ALT key that has a caps lock style indicator. To disable the
// indicator, we need to call setShiftLocked(false).
keyboard
.
setShiftLocked
(
false
);
}
}
private
LatinKeyboard
getKeyboard
(
KeyboardId
id
)
{
final
SoftReference
<
LatinKeyboard
>
ref
=
mKeyboardCache
.
get
(
id
);
LatinKeyboard
keyboard
=
(
ref
==
null
)
?
null
:
ref
.
get
();
...
...
@@ -419,7 +405,13 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
// Implements {@link KeyboardState.SwitchActions}.
@Override
public
void
setSymbolsShiftedKeyboard
()
{
setKeyboard
(
getKeyboard
(
mSymbolsShiftedKeyboardId
));
final
Keyboard
keyboard
=
getKeyboard
(
mSymbolsShiftedKeyboardId
);
setKeyboard
(
keyboard
);
// TODO: Remove this logic once we introduce initial keyboard shift state attribute.
// Symbol shift keyboard may have a shift key that has a caps lock style indicator (a.k.a.
// sticky shift key). To show or dismiss the indicator, we need to call setShiftLocked()
// that takes care of the current keyboard having such shift key or not.
keyboard
.
setShiftLocked
(
keyboard
.
hasShiftLockKey
());
}
public
boolean
isInMomentarySwitchState
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment