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

Commit cf016984 authored by Jim Miller's avatar Jim Miller
Browse files

Fix 3330653: Update lockscreen layouts to match latest mocks 

This change list:

- simplifies the UI design to reduce the number of
on-screen items by combining Alarm status with the date line.

- updates many of the layout files to match closer to the
final design.

- Simplifies the logic for showing Status1 info. It's now
more predictable and robust.

- updates the layout for tablets

- contains a modified alpha to work well with different backgrounds
(Tested: white, gray, and dark backgrounds)

- updates the tablet icons to something closer to the final size.

Change-Id: Ifb349dfa778e9c91b0649c8d95229607be5af8e5
parent 6c30cfb0

core/res/res/drawable-xlarge-mdpi/ic_lock_idle_alarm.png

−2.13 KiB (650 B)
Loading image diff...

core/res/res/drawable-xlarge-mdpi/ic_lock_idle_charging.png

−1.06 KiB (679 B)
Loading image diff...

core/res/res/drawable-xlarge-mdpi/ic_lock_idle_lock.png

−1.01 KiB (521 B)
Loading image diff...

core/res/res/drawable-xlarge-mdpi/ic_lock_idle_low_battery.png

−1.15 KiB (607 B)
Loading image diff...

core/res/res/layout-xlarge/keyguard_screen_password_landscape.xml

+17 −12
Original line number Diff line number Diff line
@@ -23,16 +23,21 @@ 
    android:orientation="horizontal"

        >



    <!-- left side: status and emergency call button -->

    <LinearLayout

    <!-- left side: status -->

    <RelativeLayout

        android:layout_height="match_parent"

        android:layout_weight="1"

            android:layout_width="0dip"

            android:orientation="vertical"

            android:gravity="center_vertical"

                >

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

    </LinearLayout>

        android:layout_width="0dip">



        <include layout="@layout/keyguard_screen_status_land"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="102dip"

            android:layout_marginTop="320dip"

            android:layout_alignParentTop="true"

            android:layout_alignParentLeft="true"/>



    </RelativeLayout>



    <!-- right side: password -->

    <LinearLayout