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

Commit f84e1145 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "keyguard: fix layout for 320dp devices" into mr1-staging

parents 6c356cc4 9220e476

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_maxHeight="@dimen/keyguard_security_height"

            android:layout_maxHeight="@dimen/keyguard_security_no_widget_height"

            androidprv:layout_childType="challenge"

            android:padding="0dp"

            android:gravity="bottom|center_horizontal">

core/res/res/layout/keyguard_sim_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_maxWidth="@dimen/keyguard_security_width"

    android:layout_maxHeight="@dimen/keyguard_security_height"

    android:layout_maxHeight="@dimen/keyguard_security_no_widget_height"

    android:gravity="center_horizontal">



    <ImageView

core/res/res/layout/keyguard_sim_puk_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_maxWidth="@dimen/keyguard_security_width"

    android:layout_maxHeight="@dimen/keyguard_security_height"

    android:layout_maxHeight="@dimen/keyguard_security_no_widget_height"

    android:gravity="center_horizontal">



    <ImageView

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

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

<!--

**

** Copyright 2012, The Android Open Source Project

** Copyright 2012, The CyanogenMod 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.

*/

-->



<resources>

    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->

    <dimen name="keyguard_security_height">400dp</dimen>



    <!-- Height of the sliding KeyguardSecurityContainer with hidden widget (includes 2x keyguard_security_view_margin) -->

    <dimen name="keyguard_security_no_widget_height">400dp</dimen>



    <!-- Left padding of num pad key on keyguard -->

    <dimen name="kg_num_pad_key_padding_left">20dp</dimen>

</resources>
 
 No newline at end of file

core/res/res/values/dimens.xml

+7 −1
Original line number Diff line number Diff line
@@ -310,7 +310,10 @@ 
    <dimen name="keyguard_security_width">320dp</dimen>



    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->

    <dimen name="keyguard_security_height">400dp</dimen>

    <dimen name="keyguard_security_height">350dp</dimen>



    <!-- Height of the sliding KeyguardSecurityContainer with hidden widget (includes 2x keyguard_security_view_margin) -->

    <dimen name="keyguard_security_no_widget_height">450dp</dimen>



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

    <dimen name="keyguard_security_view_margin">8dp</dimen>
@@ -343,4 +346,7 @@ 
    security mode. -->

    <dimen name="kg_small_widget_height">160dp</dimen>



    <!-- Left padding of num pad key on keyguard -->

    <dimen name="kg_num_pad_key_padding_left">10dp</dimen>



</resources>