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

Commit 89c7570d authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Make crypt dialogs material

White on black material theme
Center text
Remove fade to black task
Fix emergency call button

Note - does not implement all requirements of frames in the defect. More
to follow.

Bug: 15328359
Change-Id: I878e59dccffff366ba2484bb77482e168cbd2b81
parent 6f877156
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -33,15 +33,14 @@
    >
        <include layout="@layout/crypt_keeper_password_field" />
    </LinearLayout>

    <!-- Emergency call button.
         Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
         Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
    <Button android:id="@+id/emergencyCallButton"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="16dip"
        style="@*android:style/Widget.Button.Transparent"
        style="?android:attr/borderlessButtonStyle"
        android:textSize="14sp"
        android:drawablePadding="6dip"
        />
+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
        android:inputType="textPassword"
        android:imeOptions="flagForceAscii|actionDone"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:gravity="center_horizontal"
     />

   <ImageView android:id="@+id/switch_ime_button"
+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="16dip"
        style="@*android:style/Widget.Button.Transparent"
        android:textSize="14sp"
        style="?android:attr/borderlessButtonStyle"
        android:drawablePadding="6dip"
    />

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="16dip"
        style="@*android:style/Widget.Button.Transparent"
        android:textSize="14sp"
        style="?android:attr/borderlessButtonStyle"
        android:drawablePadding="6dip"
    />

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
        android:inputType="numberPassword"
        android:imeOptions="flagForceAscii|actionDone"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:gravity="center_horizontal"
     />

   <ImageView android:id="@+id/switch_ime_button"
Loading