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

Commit 62539859 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev

parents 4505a43f 24b351ab

core/res/res/anim/screen_user_enter.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
-->



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

    <translate android:fromXDelta="100%p" android:toXDelta="0"

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

core/res/res/anim/screen_user_exit.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
-->



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

    <translate android:fromXDelta="0" android:toXDelta="-100%p"

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

            android:duration="500"

            android:interpolator="@interpolator/decelerate_quad" />

core/res/res/drawable/kg_avatar_overlay.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <item android:state_pressed="true"

        android:drawable="@drawable/activity_picker_bg_activated" />

</selector>
 
 No newline at end of file

core/res/res/layout/keyguard_multi_user_avatar.xml

+3 −1
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ 
    android:layout_width="125dp"

    android:layout_height="125dp"

    android:background="#550000ff"

    android:gravity="center_horizontal">

    android:gravity="center_horizontal"

    android:foreground="@drawable/kg_avatar_overlay">

    <ImageView

        android:id="@+id/keyguard_user_avatar"

        android:scaleType="centerCrop"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"/>

core/res/res/layout/keyguard_multi_user_selector.xml

+8 −16
Original line number Diff line number Diff line
@@ -19,23 +19,15 @@ 
<com.android.internal.policy.impl.keyguard.KeyguardMultiUserSelectorView

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

    android:orientation="horizontal"

    android:layout_width="375dp"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center">



    <include

        android:id="@+id/keyguard_active_user"

        android:layout_width="250dp"

        android:layout_height="250dp"

        layout="@layout/keyguard_multi_user_avatar"/>

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

        android:id="@+id/keyguard_users_grid"

        android:orientation="horizontal"

        android:layout_width="300dp"

        android:layout_height="300dp"

        android:layout_gravity="center" />



    <ScrollView

        android:layout_width="125dp"

        android:layout_height="250dp">

        <LinearLayout

            android:id="@+id/keyguard_inactive_users"

            android:orientation="vertical"

            layout_width="match_parent"

            layout_height="wrap_content"/>

    </ScrollView>

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