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

Commit 13712a3b authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Fixed SIM pin pad overlap" into qt-dev

parents fc892fe7 32774925

packages/SystemUI/res-keyguard/values-sw320dp/dimens.xml

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

<!--

/* //device/apps/common/assets/res/any/dimens.xml

**

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

*/

-->

<resources>



    <!-- Height of the sliding KeyguardSecurityContainer

         (includes 2x keyguard_security_view_top_margin) -->

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



</resources>

packages/SystemUI/res-keyguard/values-sw360dp/dimens.xml

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

<!--

/* //device/apps/common/assets/res/any/dimens.xml

**

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

*/

-->

<resources>



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

         keyguard_security_view_top_margin) -->

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

</resources>

packages/SystemUI/res-keyguard/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ 


    <!-- Height of the sliding KeyguardSecurityContainer

         (includes 2x keyguard_security_view_top_margin) -->

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

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



    <!-- Max Height of the sliding KeyguardSecurityContainer

         (includes 2x keyguard_security_view_top_margin) -->

    <dimen name="keyguard_security_max_height">505dp</dimen>

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



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

    <dimen name="keyguard_security_view_top_margin">8dp</dimen>

packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.Looper; 
import android.os.SystemClock;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.view.View;

import android.widget.TextView;
@@ -119,6 +120,15 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp 
        update();

    }



    @Override

    public void onDensityOrFontScaleChanged() {

        TypedArray array = mContext.obtainStyledAttributes(R.style.Keyguard_TextView, new int[] {

                android.R.attr.textSize

        });

        setTextSize(TypedValue.COMPLEX_UNIT_PX, array.getDimensionPixelSize(0, 0));

        array.recycle();

    }



    @Override

    public void setMessage(CharSequence msg) {

        if (!TextUtils.isEmpty(msg)) {