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

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

Merge "3D carousel initial stab -- paging outlines / alpha effects pending... 

Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev
parents a15eeacf 9ec871de

core/res/res/layout-land/keyguard_host_view.xml

+7 −7
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 
        android:clipChildren="false">



        <include layout="@layout/keyguard_widget_pager"

            android:id="@+id/app_widget_container"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            androidprv:layout_centerWithinArea="0.55"

            androidprv:layout_childType="widget"

            androidprv:layout_maxWidth="480dp"

            androidprv:layout_maxHeight="480dp" />



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



        <View android:layout_width="match_parent"

core/res/res/layout-land/keyguard_widget_pager.xml

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

<!--

**

** Copyright 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.

*/

-->



<!-- This is the selector widget that allows the user to select an action. -->

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

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

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

    android:paddingLeft="25dp"

    android:paddingRight="25dp"

    android:paddingTop="25dp"

    android:paddingBottom="25dp"

    android:clipChildren="false"

    android:clipToPadding="false"

    androidprv:pageSpacing="10dp">

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

core/res/res/layout-port/keyguard_host_view.xml

+4 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent">

            <include layout="@layout/keyguard_widget_pager"

                android:id="@+id/app_widget_container"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center"/>

core/res/res/layout-sw600dp-port/keyguard_host_view.xml

+7 −6
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
        android:orientation="vertical">



        <include layout="@layout/keyguard_widget_pager"

            android:id="@+id/app_widget_container"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            androidprv:layout_centerWithinArea="0.55"