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

Commit c62d321e authored by Vikram Aggarwal's avatar Vikram Aggarwal
Browse files

UI fixes for tablets 

1. Center the clock on Xoom and large tablets. Fix b/5579000

2. Correctly remove the emergency call button if the device (*cough*
   Nakasi *cough*) does not have telephone capability.

Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
parent 277cf8cc

res/layout-sw600dp/crypt_keeper_password_entry.xml

+5 −3
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
** limitations under the License.

*/

-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

>
@@ -25,7 +26,7 @@ 
    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:layout_gravity="center_horizontal"

        android:layout_marginTop="318dip"

    >

        <ImageView android:id="@+id/encroid"
@@ -53,10 +54,11 @@ 
            android:layout_width="320dip"

            android:layout_toRightOf="@+id/passwordLabel"

            android:layout_marginTop="26dip"

            android:layout_centerVertical="true"

            android:orientation="horizontal"

        >

            <include layout="@layout/crypt_keeper_password_field" />

        </LinearLayout>

    </RelativeLayout>



</RelativeLayout>
 
</LinearLayout>

res/layout/crypt_keeper_status.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:orientation="vertical"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center_horizontal"

>



    <com.android.internal.widget.DigitalClock android:id="@+id/time"
@@ -31,6 +32,7 @@ 
        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:layout_marginTop="8dip"

        android:layout_gravity="center"

        android:layout_marginBottom="8dip"

        >

src/com/android/settings/CryptKeeper.java

+10 −0
Original line number Diff line number Diff line
@@ -476,6 +476,16 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
        mPasswordEntry.setOnEditorActionListener(this);

        mPasswordEntry.requestFocus();



        // Disable the Emergency call button if the device has no voice telephone capability

        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);

        if (!tm.isVoiceCapable()) {

            final View emergencyCall = findViewById(R.id.emergencyCallButton);

            if (emergencyCall != null) {

                Log.d(TAG, "Removing the emergency Call button");

                emergencyCall.setVisibility(View.GONE);

            }

        }



        final View imeSwitcher = findViewById(R.id.switch_ime_button);

        final InputMethodManager imm = (InputMethodManager) getSystemService(

                Context.INPUT_METHOD_SERVICE);