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

Commit 3867ddab authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev

parents 1afe7788 692bb133

core/res/res/layout/keyguard_multi_user_avatar.xml

+16 −27
Original line number Diff line number Diff line
@@ -20,37 +20,26 @@ 
<!-- 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="@dimen/keyguard_avatar_width"

    android:layout_height="@dimen/keyguard_avatar_height"

    android:paddingLeft="@dimen/keyguard_avatar_padding"

    android:paddingRight="@dimen/keyguard_avatar_padding"

    android:layout_width="@dimen/keyguard_avatar_size"

    android:layout_height="@dimen/keyguard_avatar_size"

    android:background="#00000000"

    android:gravity="center_horizontal">

    <ImageView

        android:id="@+id/keyguard_user_avatar"

        android:scaleType="centerCrop"

        android:scaleType="center"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"/>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">

        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="0.78" />

    <TextView

       android:id="@+id/keyguard_user_name"

       android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="0.22"

            android:paddingLeft="6dp"

            android:layout_gravity="center_vertical|left"

            android:textSize="16sp"

       android:layout_height="wrap_content"

       android:layout_gravity="bottom"

       android:gravity="center"

       android:textSize="@dimen/keyguard_avatar_name_size"

       android:textColor="#ffffff"

       android:singleLine="true"

       android:ellipsize="end"

            android:background="#808080" />

    </LinearLayout>

       android:paddingLeft="2dp"

       android:paddingRight="2dp" />

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

core/res/res/layout/keyguard_multi_user_selector.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_marginBottom="40dp"

        android:layout_height="@dimen/keyguard_avatar_height"

        android:layout_height="@dimen/keyguard_avatar_size"

        android:layout_gravity="center|bottom" />



</com.android.internal.policy.impl.keyguard.KeyguardMultiUserSelectorView>

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

+7 −6
Original line number Diff line number Diff line
@@ -103,12 +103,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>

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

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



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

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

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

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



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

    <dimen name="keyguard_avatar_name_size">12sp</dimen>



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

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

</resources>

core/res/res/values/colors.xml

+4 −4
Original line number Diff line number Diff line
@@ -191,9 +191,9 @@ 
    <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>



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

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

    <color name="keyguard_avatar_nick_color">#ffffffff</color>

    <color name="keyguard_avatar_frame_pressed_color">#ff35b5e5</color>

</resources>

core/res/res/values/dimens.xml

+5 −15
Original line number Diff line number Diff line
@@ -310,24 +310,14 @@ 
    <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>

    <dimen name="keyguard_avatar_frame_stroke_width">2dp</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>

    <dimen name="keyguard_avatar_frame_shadow_radius">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>

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



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

    <dimen name="keyguard_avatar_name_size">10sp</dimen>

</resources>