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

Commit f4ef1521 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am bca987aa: am 42517367: Merge "Update keyguard layouts on phone" into jb-mr1-dev 

* commit 'bca987aa':
  Update keyguard layouts on phone
parents fc3cacdb bca987aa

core/java/com/android/internal/widget/PasswordEntryKeyboardHelper.java

+56 −28
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.KeyCharacterMap; 
import android.view.KeyEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup.LayoutParams;

import android.view.ViewRootImpl;

import com.android.internal.R;
@@ -55,23 +56,56 @@ public class PasswordEntryKeyboardHelper implements OnKeyboardActionListener { 
    private long[] mVibratePattern;

    private boolean mEnableHaptics = false;



    private static final int NUMERIC = 0;

    private static final int QWERTY = 1;

    private static final int QWERTY_SHIFTED = 2;

    private static final int SYMBOLS = 3;

    private static final int SYMBOLS_SHIFTED = 4;



    int mLayouts[] = new int[] {

            R.xml.password_kbd_numeric,

            R.xml.password_kbd_qwerty,

            R.xml.password_kbd_qwerty_shifted,

            R.xml.password_kbd_symbols,

            R.xml.password_kbd_symbols_shift

            };



    private boolean mUsingScreenWidth;



    public PasswordEntryKeyboardHelper(Context context, KeyboardView keyboardView, View targetView) {

        this(context, keyboardView, targetView, true);

        this(context, keyboardView, targetView, true, null);

    }



    public PasswordEntryKeyboardHelper(Context context, KeyboardView keyboardView, View targetView,

            boolean useFullScreenWidth) {

        this(context, keyboardView, targetView, useFullScreenWidth, null);

    }



    public PasswordEntryKeyboardHelper(Context context, KeyboardView keyboardView, View targetView,

            boolean useFullScreenWidth, int layouts[]) {

        mContext = context;

        mTargetView = targetView;

        mKeyboardView = keyboardView;

        if (useFullScreenWidth

                || mKeyboardView.getLayoutParams().width == ViewGroup.LayoutParams.MATCH_PARENT) {

        mKeyboardView.setOnKeyboardActionListener(this);

        mUsingScreenWidth = useFullScreenWidth;

        if (layouts != null) {

            if (layouts.length != mLayouts.length) {

                throw new RuntimeException("Wrong number of layouts");

            }

            for (int i = 0; i < mLayouts.length; i++) {

                mLayouts[i] = layouts[i];

            }

        }

        createKeyboards();

    }



    public void createKeyboards() {

        LayoutParams lp = mKeyboardView.getLayoutParams();

        if (mUsingScreenWidth || lp.width == ViewGroup.LayoutParams.MATCH_PARENT) {

            createKeyboardsWithDefaultWidth();

        } else {

            createKeyboardsWithSpecificSize(mKeyboardView.getLayoutParams().width,

                    mKeyboardView.getLayoutParams().height);

            createKeyboardsWithSpecificSize(lp.width, lp.height);

        }

        mKeyboardView.setOnKeyboardActionListener(this);

    }



    public void setEnableHaptics(boolean enabled) {
@@ -82,46 +116,40 @@ public class PasswordEntryKeyboardHelper implements OnKeyboardActionListener { 
        return mKeyboardMode == KEYBOARD_MODE_ALPHA;

    }



    private void createKeyboardsWithSpecificSize(int viewWidth, int viewHeight) {

        mNumericKeyboard = new PasswordEntryKeyboard(mContext, R.xml.password_kbd_numeric,

                viewWidth, viewHeight);

        mQwertyKeyboard = new PasswordEntryKeyboard(mContext,

                R.xml.password_kbd_qwerty, R.id.mode_normal, viewWidth, viewHeight);

    private void createKeyboardsWithSpecificSize(int width, int height) {

        mNumericKeyboard = new PasswordEntryKeyboard(mContext, mLayouts[NUMERIC], width, height);

        mQwertyKeyboard = new PasswordEntryKeyboard(mContext, mLayouts[QWERTY], R.id.mode_normal,

                width, height);

        mQwertyKeyboard.enableShiftLock();



        mQwertyKeyboardShifted = new PasswordEntryKeyboard(mContext,

                R.xml.password_kbd_qwerty_shifted,

                R.id.mode_normal, viewWidth, viewHeight);

        mQwertyKeyboardShifted = new PasswordEntryKeyboard(mContext, mLayouts[QWERTY_SHIFTED],

                R.id.mode_normal, width, height);

        mQwertyKeyboardShifted.enableShiftLock();

        mQwertyKeyboardShifted.setShifted(true); // always shifted.



        mSymbolsKeyboard = new PasswordEntryKeyboard(mContext, R.xml.password_kbd_symbols,

                viewWidth, viewHeight);

        mSymbolsKeyboard = new PasswordEntryKeyboard(mContext, mLayouts[SYMBOLS], width, height);

        mSymbolsKeyboard.enableShiftLock();



        mSymbolsKeyboardShifted = new PasswordEntryKeyboard(mContext,

                R.xml.password_kbd_symbols_shift, viewWidth, viewHeight);

        mSymbolsKeyboardShifted = new PasswordEntryKeyboard(mContext, mLayouts[SYMBOLS_SHIFTED],

                width, height);

        mSymbolsKeyboardShifted.enableShiftLock();

        mSymbolsKeyboardShifted.setShifted(true); // always shifted

    }



    private void createKeyboards() {

        mNumericKeyboard = new PasswordEntryKeyboard(mContext, R.xml.password_kbd_numeric);

        mQwertyKeyboard = new PasswordEntryKeyboard(mContext,

                R.xml.password_kbd_qwerty, R.id.mode_normal);

    private void createKeyboardsWithDefaultWidth() {

        mNumericKeyboard = new PasswordEntryKeyboard(mContext, mLayouts[NUMERIC]);

        mQwertyKeyboard = new PasswordEntryKeyboard(mContext, mLayouts[QWERTY], R.id.mode_normal);

        mQwertyKeyboard.enableShiftLock();



        mQwertyKeyboardShifted = new PasswordEntryKeyboard(mContext,

                R.xml.password_kbd_qwerty_shifted,

        mQwertyKeyboardShifted = new PasswordEntryKeyboard(mContext, mLayouts[QWERTY_SHIFTED],

                R.id.mode_normal);

        mQwertyKeyboardShifted.enableShiftLock();

        mQwertyKeyboardShifted.setShifted(true); // always shifted.



        mSymbolsKeyboard = new PasswordEntryKeyboard(mContext, R.xml.password_kbd_symbols);

        mSymbolsKeyboard = new PasswordEntryKeyboard(mContext, mLayouts[SYMBOLS]);

        mSymbolsKeyboard.enableShiftLock();



        mSymbolsKeyboardShifted = new PasswordEntryKeyboard(mContext,

                R.xml.password_kbd_symbols_shift);

        mSymbolsKeyboardShifted = new PasswordEntryKeyboard(mContext, mLayouts[SYMBOLS_SHIFTED]);

        mSymbolsKeyboardShifted.enableShiftLock();

        mSymbolsKeyboardShifted.setShifted(true); // always shifted

    }

core/res/res/drawable-hdpi/ic_lockscreen_alarm.png

0 → 100644
+1.37 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_lockscreen_sim.png

0 → 100644
+3.99 KiB
Loading image diff...

core/res/res/drawable-hdpi/lockscreen_protection_pattern.png

0 → 100644
+347 B
Loading image diff...

core/res/res/drawable-hdpi/sym_keyboard_delete.png

100755 → 100644
−1.11 KiB (1.12 KiB)
Loading image diff...