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

Commit 022554e3 authored by Jim Miller's avatar Jim Miller
Browse files

Merge latest prototype changes into keyguard 

- multi-user avatar stuff.
- new SlidingChallengeLayout changes.

Change-Id: I45bec7313b71dbca16544e7525281bf6c0e44a25
parent c28261d4

core/res/res/layout/keyguard_multi_user_avatar.xml

+5 −3
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ 
<!-- This is a view that shows general status information in Keyguard. -->

<com.android.internal.policy.impl.keyguard.KeyguardMultiUserAvatar

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

    android:layout_width="125dp"

    android:layout_height="125dp"

    android:background="#000000"

    android:layout_width="@dimen/keyguard_avatar_width"

    android:layout_height="@dimen/keyguard_avatar_height"

    android:paddingLeft="@dimen/keyguard_avatar_padding"

    android:paddingRight="@dimen/keyguard_avatar_padding"

    android:background="#00000000"

    android:gravity="center_horizontal">

    <ImageView

        android:id="@+id/keyguard_user_avatar"

core/res/res/layout/keyguard_multi_user_selector.xml

+5 −4
Original line number Diff line number Diff line
@@ -24,11 +24,12 @@ 
    android:layout_gravity="center"

    android:contentDescription="@string/keyguard_accessibility_user_selector">



    <com.android.internal.policy.impl.keyguard.KeyguardSubdivisionLayout

    <om.android.internal.policy.impl.keyguard.KeyguardLinearLayout

        android:id="@+id/keyguard_users_grid"

        android:orientation="horizontal"

        android:layout_width="300dp"

        android:layout_height="300dp"

        android:layout_gravity="center" />

        android:layout_width="wrap_content"

        android:layout_marginBottom="40dp"

        android:layout_height="@dimen/keyguard_avatar_height"

        android:layout_gravity="center|bottom" />



</com.android.internal.policy.impl.keyguard.KeyguardMultiUserSelectorView>
 
 No newline at end of file

core/res/res/values-sw720dp/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -102,4 +102,13 @@ 


    <!-- Margin around the various security views -->

    <dimen name="keyguard_security_view_margin">100dp</dimen>



    <!-- Size of the avator on hte multiuser lockscreen. -->

    <dimen name="keyguard_avatar_height">60dp</dimen>



    <!-- Size of the avator on hte multiuser lockscreen. -->

    <dimen name="keyguard_avatar_padding">14dp</dimen>



    <!-- The height of the avator plus twice the padding. -->

    <dimen name="keyguard_avatar_width">88dp</dimen>

</resources>

core/res/res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -190,5 +190,10 @@ 
    <drawable name="notification_template_icon_bg">#3333B5E5</drawable>

    <drawable name="notification_template_icon_low_bg">#0cffffff</drawable>



    <!-- Keyguard colors -->

    <color name="keyguard_avatar_matte_color">#ff424242</color>

    <color name="keyguard_avatar_frame_color">#ffcccccc</color>

    <color name="keyguard_avatar_frame_shadow_color">#ff000000</color>



</resources>

core/res/res/values/dimens.xml

+22 −0
Original line number Diff line number Diff line
@@ -308,4 +308,26 @@ 


    <!-- Margin around the various security views -->

    <dimen name="keyguard_security_view_margin">8dp</dimen>



    <!-- Stroke width of the frame for the circular avatars. -->

    <dimen name="keyguard_avatar_frame_stroke_width">3dp</dimen>



    <!-- Shadow radius under the frame for the circular avatars. -->

    <dimen name="keyguard_avatar_frame_shadow_radius">3dp</dimen>



    <!-- Shadow horizontal offset under the frame for the circular avatars. -->

    <dimen name="keyguard_avatar_frame_shadow_dx">1dp</dimen>



    <!-- Shadow vertical offset under the frame for the circular avatars. -->

    <dimen name="keyguard_avatar_frame_shadow_dy">1dp</dimen>



    <!-- Size of the avator on hte multiuser lockscreen. -->

    <dimen name="keyguard_avatar_height">44dp</dimen>



    <!-- Size of the avator on hte multiuser lockscreen. -->

    <dimen name="keyguard_avatar_padding">11dp</dimen>



    <!-- The height of the avator plus twice the padding. -->

    <dimen name="keyguard_avatar_width">66dp</dimen>



</resources>