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

Commit 00046d6e authored by Jason parks's avatar Jason parks
Browse files

Get encryption working for phones. 

I've removed the "special" keyboard from the phone
layouts for now.

Change-Id: I4b18279dafb18ba7cebacfad1b7167e34a7203b4
parent 6fc9c2fd

res/layout/crypt_keeper_password_entry.xml

+10 −33
Original line number Diff line number Diff line
@@ -31,38 +31,15 @@ 
       <include layout="@layout/crypt_keeper_status" />

   </LinearLayout>



   <!-- right side: password -->

   <LinearLayout

       android:layout_width="match_parent"

       android:layout_height="match_parent"

       android:orientation="vertical"

       android:gravity="center">



       <!-- Password entry field -->

   <EditText android:id="@+id/passwordEntry"

       android:layout_height="wrap_content"

           android:layout_width="450dip"

       android:layout_width="match_parent"

       android:singleLine="true"

       android:textStyle="normal"

       android:inputType="textPassword"

           android:gravity="center"

           android:layout_gravity="center"

       android:textSize="24sp"

           android:layout_marginTop="120dip"

           android:layout_marginBottom="5dip"

       android:textAppearance="?android:attr/textAppearanceMedium"

       android:textColor="#ffffffff"

           android:editable="false"

        />



       <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

           android:layout_width="450dip"

           android:layout_height="230dip"

           android:background="#00000000"

           android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"

           android:visibility="visible"

    />



</LinearLayout>
 
 No newline at end of file
 
    

</LinearLayout>
 
 No newline at end of file

res/layout/crypt_keeper_progress.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ 
    

    

    <TextView

        android:id="@+id/status"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"

        android:layout_marginLeft="16dip"

        android:text="@string/crypt_keeper_setup_description"

    />



</LinearLayout>

src/com/android/settings/CryptKeeper.java

+6 −4
Original line number Diff line number Diff line
@@ -342,10 +342,12 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 


        KeyboardView keyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard);



        if (keyboardView != null) {

            PasswordEntryKeyboardHelper keyboardHelper = new PasswordEntryKeyboardHelper(this,

                    keyboardView, mPasswordEntry, false);

            keyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA);

        }

    }



    private IMountService getMountService() {

        IBinder service = ServiceManager.getService("mount");
@@ -357,7 +359,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 


    @Override

    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {

        if (actionId == EditorInfo.IME_NULL) {

        if (actionId == EditorInfo.IME_NULL || actionId == EditorInfo.IME_ACTION_DONE) {

            // Get the password

            String password = v.getText().toString();

src/com/android/settings/CryptKeeperConfirm.java

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ public class CryptKeeperConfirm extends Fragment { 
                public void run() {

                    IBinder service = ServiceManager.getService("mount");

                    if (service == null) {

                        Log.e("CryptKeeper", "Failed to find the mount service");

                        finish();

                        return;

                    }