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

Commit 816ef1c1 authored by Karl Rosaen's avatar Karl Rosaen
Browse files

Update layouts to show status (battery, alarm) info on pattern unlock screen. make buttons dark.

parent bb339ead

core/res/res/drawable-hdpi/btn_lock_normal.9.png

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

core/res/res/drawable-mdpi/btn_lock_normal.9.png

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

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+47 −13
Original line number Original line Diff line number Diff line
@@ -85,21 +85,45 @@ 
            android:background="@android:drawable/divider_horizontal_dark"

            android:background="@android:drawable/divider_horizontal_dark"

                />

                />





        <!-- lock icon and header message -->

        <!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging

             status.  -->

        <LinearLayout

            android:orientation="horizontal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dip"

            android:gravity="center"

            >

            <TextView

            <TextView

            android:id="@+id/headerText"

                android:id="@+id/status1"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

            android:layout_marginTop="12dip"

            android:layout_centerHorizontal="true"

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

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

                android:textColor="?android:attr/textColorSecondary"

                android:textColor="?android:attr/textColorSecondary"

                android:textSize="17sp"

                android:textSize="17sp"

            android:drawableLeft="@drawable/ic_lock_idle_lock"

                android:drawablePadding="4dip"

                android:drawablePadding="4dip"

            android:gravity="center"

                />

                />



            <TextView

                android:id="@+id/statusSep"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="5dip"

                android:layout_marginRight="5dip"

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

                android:textColor="?android:attr/textColorSecondary"

                android:textSize="17sp"

                />

            <TextView

                android:id="@+id/status2"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentTop="true"

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

                android:textColor="?android:attr/textColorSecondary"

                android:textSize="17sp"

                android:drawablePadding="4dip"

                />

        </LinearLayout>





        <!-- fill space between header and button below -->

        <!-- fill space between header and button below -->

        <View

        <View
@@ -118,12 +142,16 @@ 
            <RelativeLayout android:id="@+id/footerNormal"

            <RelativeLayout android:id="@+id/footerNormal"

                android:layout_width="fill_parent"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="center"

                >

                >

                <Button android:id="@+id/emergencyCallAlone"

                <Button android:id="@+id/emergencyCallAlone"

                    android:layout_width="fill_parent"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/lockscreen_emergency_call"

                    android:text="@string/lockscreen_emergency_call"

                    android:textSize="14sp"

                    android:textSize="14sp"

                    android:background="@drawable/btn_lock_normal"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:drawableLeft="@drawable/ic_emergency"

                    android:drawableLeft="@drawable/ic_emergency"

                    android:drawablePadding="8dip"

                    android:drawablePadding="8dip"

                    />

                    />
@@ -140,6 +168,9 @@ 
                    android:layout_width="fill_parent"

                    android:layout_width="fill_parent"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

                    android:textSize="14sp"

                    android:textSize="14sp"

                    android:background="@drawable/btn_lock_normal"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:visibility="invisible"

                    android:visibility="invisible"

                    />

                    />

                <Button android:id="@+id/emergencyCallTogether"

                <Button android:id="@+id/emergencyCallTogether"
@@ -147,6 +178,9 @@ 
                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

                    android:text="@string/lockscreen_emergency_call"

                    android:text="@string/lockscreen_emergency_call"

                    android:textSize="14sp"

                    android:textSize="14sp"

                    android:background="@drawable/btn_lock_normal"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:drawableLeft="@drawable/ic_emergency"

                    android:drawableLeft="@drawable/ic_emergency"

                    android:drawablePadding="8dip"

                    android:drawablePadding="8dip"

                    />

                    />

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+42 −10
Original line number Original line Diff line number Diff line
@@ -84,19 +84,45 @@ 
        android:background="@android:drawable/divider_horizontal_dark"

        android:background="@android:drawable/divider_horizontal_dark"

            />

            />





    <!-- lock icon and header message -->

    <!-- used for instructions such as "draw pattern to unlock", the next alarm, and charging

    <TextView

         status.  -->

        android:id="@+id/headerText"

    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="3dip"

        android:layout_marginTop="3dip"

        android:layout_centerHorizontal="true"

        android:gravity="center"

        >

        <TextView

            android:id="@+id/status1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

            android:textColor="?android:attr/textColorSecondary"

            android:textSize="17sp"

            android:drawablePadding="4dip"

            />

        <TextView

            android:id="@+id/statusSep"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="5dip"

            android:layout_marginRight="5dip"

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

            android:textColor="?android:attr/textColorSecondary"

            android:textSize="17sp"

            />

        <TextView

            android:id="@+id/status2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

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

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

            android:textColor="?android:attr/textColorSecondary"

            android:textColor="?android:attr/textColorSecondary"

            android:textSize="17sp"

            android:textSize="17sp"

        android:drawableLeft="@drawable/ic_lock_idle_lock"

            android:drawablePadding="4dip"

            android:drawablePadding="4dip"

            />

            />

    </LinearLayout>





    <com.android.internal.widget.LockPatternView

    <com.android.internal.widget.LockPatternView

        android:id="@+id/lockPattern"

        android:id="@+id/lockPattern"
@@ -122,7 +148,9 @@ 
                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

                android:layout_centerInParent="true"

                android:layout_centerInParent="true"

                android:text="@string/lockscreen_emergency_call"

                android:text="@string/lockscreen_emergency_call"

                android:background="@drawable/btn_lock_normal"

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

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

                android:textColor="?android:attr/textColorPrimary"

                android:drawableLeft="@drawable/ic_emergency"

                android:drawableLeft="@drawable/ic_emergency"

                android:drawablePadding="8dip"

                android:drawablePadding="8dip"

                />

                />
@@ -145,7 +173,9 @@ 
                android:layout_marginLeft="4dip"

                android:layout_marginLeft="4dip"

                android:layout_marginRight="2dip"

                android:layout_marginRight="2dip"

                android:text="@string/lockscreen_emergency_call"

                android:text="@string/lockscreen_emergency_call"

                android:background="@drawable/btn_lock_normal"

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

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

                android:textColor="?android:attr/textColorPrimary"

                android:drawableLeft="@drawable/ic_emergency"

                android:drawableLeft="@drawable/ic_emergency"

                android:drawablePadding="8dip"

                android:drawablePadding="8dip"

                />

                />
@@ -157,7 +187,9 @@ 
                android:layout_marginBottom="4dip"

                android:layout_marginBottom="4dip"

                android:layout_marginLeft="2dip"

                android:layout_marginLeft="2dip"

                android:layout_marginRight="4dip"

                android:layout_marginRight="4dip"

                android:background="@drawable/btn_lock_normal"

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

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

                android:textColor="?android:attr/textColorPrimary"

                android:visibility="invisible"

                android:visibility="invisible"

                />

                />

        </LinearLayout>

        </LinearLayout>

core/res/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -1345,6 +1345,8 @@ 
    <!-- When the lock screen is showing, the phone is plugged in and the battery is fully

    <!-- When the lock screen is showing, the phone is plugged in and the battery is fully

         charged, say that it is charged. -->

         charged, say that it is charged. -->

    <string name="lockscreen_charged">Charged.</string>

    <string name="lockscreen_charged">Charged.</string>

    <!-- A short representation of charging information, e.g "34%" -->

    <string name="lockscreen_battery_short"><xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>





    <!-- When the lock screen is showing and the battery is low, warn user to plug

    <!-- When the lock screen is showing and the battery is low, warn user to plug

         in the phone soon. -->

         in the phone soon. -->