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

Commit 8a26bf5a authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Impose a height & width downward on challenge views. 

This means that challenges may no longer wrap_content, even
vertically. But it's the only way to rationalize across
different challenges, some of which want to be a fixed size,
some match_parent, and some wrap_content.

This change also fixes some problems with the password view
as well as PIN view (usable again on sw360 devices like
Galaxy Nexus).

Bug: 7427586
Change-Id: I648e68c5159fef7cf594d4bfe8f6d4bdd5da6b6a
Proto-Id: I280b4875a9deee5dfb7409bdfa8ed0b96fbd0cff
parent cf69c56b

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

+4 −4
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ 


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

            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_width="@dimen/keyguard_security_width"

            android:layout_height="@dimen/keyguard_security_height"

            androidprv:layout_childType="challenge"

            androidprv:layout_centerWithinArea="0.55">

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

                android:id="@+id/view_flipper"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:clipChildren="false"

                android:clipToPadding="false"

                android:paddingLeft="@dimen/keyguard_security_view_margin"

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

+4 −4
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 


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

            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_width="@dimen/keyguard_security_width"

            android:layout_height="@dimen/keyguard_security_height"

            androidprv:layout_childType="challenge"

            android:layout_marginLeft="@dimen/kg_edge_swipe_region_size"

            android:layout_marginRight="@dimen/kg_edge_swipe_region_size"
@@ -60,8 +60,8 @@ 
            android:gravity="bottom|center_horizontal">

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

                android:id="@+id/view_flipper"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:clipChildren="false"

                android:clipToPadding="false"

                android:paddingLeft="@dimen/keyguard_security_view_margin"

core/res/res/layout/keyguard_password_view.xml

+46 −58
Original line number Diff line number Diff line
@@ -22,40 +22,30 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center">

    android:gravity="bottom"

    >



    <FrameLayout

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">



        <include layout="@layout/keyguard_message_area"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

        android:layout_weight="1"

        />



        <LinearLayout

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:orientation="vertical"

            android:layout_gravity="center">



            <LinearLayout

    <include layout="@layout/keyguard_message_area"

        android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">

        android:layout_height="wrap_content" />



    <!-- Password entry field -->

    <!-- Note: the entire container is styled to look like the edit field,

         since the backspace/IME switcher looks better inside -->

     <LinearLayout

                    android:layout_gravity="center_vertical|fill_horizontal"

         android:layout_height="wrap_content"

         android:layout_width="match_parent"

         android:orientation="horizontal"

         android:background="#70000000"

                    android:layout_marginStart="4dip"

                    android:layout_marginEnd="4dip">

         android:layout_marginTop="8dp"

         android:layout_marginBottom="8dp"

         >



         <EditText android:id="@+id/passwordEntry"

             android:layout_width="0dip"
@@ -86,9 +76,7 @@ 
             />



        </LinearLayout>

            </LinearLayout>

        </LinearLayout>

    </FrameLayout>



    <include layout="@layout/keyguard_emergency_carrier_area"

             android:id="@+id/keyguard_selector_fade_container"

             android:layout_width="match_parent"

core/res/res/layout/keyguard_pin_view.xml

+13 −13
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:id="@+id/keyguard_pin_view"

    android:layout_width="350dp"

    android:layout_height="350dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    >

    <include layout="@layout/keyguard_message_area"
@@ -35,7 +35,7 @@ 
        android:orientation="horizontal"

        android:layout_weight="1"

        >

        <TextView android:id="@+id/passwordEntry"

        <TextView android:id="@+id/pinEntry"

            android:editable="true"

            android:layout_width="0dip"

            android:layout_height="match_parent"
@@ -78,7 +78,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="1"

            />

        <view class="com.android.internal.policy.impl.keyguard.NumPadKey"
@@ -87,7 +87,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="2"

            />

        <view class="com.android.internal.policy.impl.keyguard.NumPadKey"
@@ -96,7 +96,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="3"

            />

    </LinearLayout>
@@ -112,7 +112,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="4"

            />

        <view class="com.android.internal.policy.impl.keyguard.NumPadKey"
@@ -121,7 +121,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="5"

            />

        <view class="com.android.internal.policy.impl.keyguard.NumPadKey"
@@ -130,7 +130,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="6"

            />

    </LinearLayout>
@@ -146,7 +146,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="7"

            />

        <view class="com.android.internal.policy.impl.keyguard.NumPadKey"
@@ -155,7 +155,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="8"

            />

        <view class="com.android.internal.policy.impl.keyguard.NumPadKey"
@@ -164,7 +164,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="9"

            />

    </LinearLayout>
@@ -185,7 +185,7 @@ 
            android:layout_width="0px"

            android:layout_height="match_parent"

            android:layout_weight="1"

            androidprv:textView="@+id/passwordEntry"

            androidprv:textView="@+id/pinEntry"

            androidprv:digit="0"

            />

        <ImageButton

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

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

*/

-->



<resources>

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

    <dimen name="keyguard_security_width">340dp</dimen>

</resources>
 
 No newline at end of file