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

Commit 60858396 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Stop dimming main keyboard while showing more keys keyboard

Bug: 17910364
Change-Id: Ibe76ee86a43c5939f48e45506c985b3f289eac7a
parent 847735fd
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack

    // More keys keyboard
    private final Paint mBackgroundDimAlphaPaint = new Paint();
    private boolean mNeedsToDimEntireKeyboard;
    private final View mMoreKeysKeyboardContainer;
    private final View mMoreKeysKeyboardForActionContainer;
    private final WeakHashMap<Key, Keyboard> mMoreKeysKeyboardCache = new WeakHashMap<>();
@@ -673,7 +672,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
        locatePreviewPlacerView();
        panel.showInParent(mDrawingPreviewPlacerView);
        mMoreKeysPanel = panel;
        dimEntireKeyboard(true /* dimmed */);
    }

    public boolean isShowingMoreKeysPanel() {
@@ -687,7 +685,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack

    @Override
    public void onDismissMoreKeysPanel() {
        dimEntireKeyboard(false /* dimmed */);
        if (isShowingMoreKeysPanel()) {
            mMoreKeysPanel.removeFromParent();
            mMoreKeysPanel = null;
@@ -815,24 +812,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
        invalidateKey(mSpaceKey);
    }

    private void dimEntireKeyboard(final boolean dimmed) {
        final boolean needsRedrawing = mNeedsToDimEntireKeyboard != dimmed;
        mNeedsToDimEntireKeyboard = dimmed;
        if (needsRedrawing) {
            invalidateAllKeys();
        }
    }

    @Override
    protected void onDraw(final Canvas canvas) {
        super.onDraw(canvas);

        // Overlay a dark rectangle to dim.
        if (mNeedsToDimEntireKeyboard) {
            canvas.drawRect(0.0f, 0.0f, getWidth(), getHeight(), mBackgroundDimAlphaPaint);
        }
    }

    @Override
    protected void onDrawKeyTopVisuals(final Key key, final Canvas canvas, final Paint paint,
            final KeyDrawParams params) {