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

Commit 68794263 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 

* commit '2514cbc2':
  Final keyguard tablet layout integration
parents 02942145 2514cbc2

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

+8 −4
Original line number Diff line number Diff line
@@ -30,15 +30,19 @@ 
    <include layout="@layout/keyguard_widget_region"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight=".45" />

        android:layout_weight="@integer/kg_widget_region_weight" />



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

        android:id="@+id/view_flipper"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="0.55"

        android:layout_marginLeft="8dp"

        android:layout_marginRight="8dp"

        android:layout_weight="@integer/kg_security_flipper_weight"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:paddingLeft="@dimen/keyguard_security_view_margin"

        android:paddingTop="@dimen/keyguard_security_view_margin"

        android:paddingRight="@dimen/keyguard_security_view_margin"

        android:paddingBottom="@dimen/keyguard_security_view_margin"

        android:gravity="center">



        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

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

+7 −2
Original line number Diff line number Diff line
@@ -22,15 +22,20 @@ 
<com.android.internal.policy.impl.keyguard.KeyguardHostView

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

    android:id="@+id/keyguard_host_view"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center_horizontal"

    android:clipChildren="false">

    android:orientation="vertical">



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

        android:id="@+id/view_flipper"

        android:layout_height="match_parent"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:paddingLeft="@dimen/keyguard_security_view_margin"

        android:paddingTop="@dimen/keyguard_security_view_margin"

        android:paddingRight="@dimen/keyguard_security_view_margin"

        android:paddingBottom="@dimen/keyguard_security_view_margin"

        android:gravity="center">



        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

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

+11 −5
Original line number Diff line number Diff line
@@ -22,21 +22,27 @@ 
<com.android.internal.policy.impl.keyguard.KeyguardHostView

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

    android:id="@+id/keyguard_host_view"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center_horizontal">

    android:gravity="center_horizontal"

    android:orientation="vertical">



    <include layout="@layout/keyguard_widget_region"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="0.4"/>

        android:layout_weight="@integer/kg_widget_region_weight" />



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

        android:id="@+id/view_flipper"

        android:layout_width="@dimen/kg_security_view_width"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="0.6"

        android:layout_weight="@integer/kg_security_flipper_weight"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:paddingLeft="@dimen/keyguard_security_view_margin"

        android:paddingTop="@dimen/keyguard_security_view_margin"

        android:paddingRight="@dimen/keyguard_security_view_margin"

        android:paddingBottom="@dimen/keyguard_security_view_margin"

        android:layout_gravity="center">



        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml

0 → 100644
+24 −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.

*/

-->

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

    <include layout="@layout/keyguard_glow_pad_view"

        android:layout_width="@dimen/kg_glow_pad_size"

        android:layout_height="@dimen/kg_glow_pad_size"

        android:layout_gravity="center" />

</merge>
 
 No newline at end of file

core/res/res/layout/keyguard_glow_pad_container.xml

0 → 100644
+25 −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.

*/

-->



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

    <include layout="@layout/keyguard_glow_pad_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center" />

</merge>
 
 No newline at end of file