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

Commit f4607172 authored by Mike Cleron's avatar Mike Cleron Committed by Android Git Automerger
Browse files

am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 

* commit '732d88e1':
  Change keyguard to use single-stage unlock.
parents dc255e43 732d88e1

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

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ 
        android:paddingBottom="@dimen/keyguard_security_view_margin"

        android:gravity="center">



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

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



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



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

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

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

<!--

**

** Copyright 2009, 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 a view that shows general status information in Keyguard. -->

<LinearLayout

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

    android:id="@+id/keyguard_status_area"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="end"

    android:layout_marginTop="-16dp"

    android:orientation="vertical">



    <TextView

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="@dimen/kg_status_date_font_size"

        />



    <TextView

        android:id="@+id/alarm_status"

        android:layout_gravity="end"

        android:layout_marginTop="28dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearance"

        android:textSize="@dimen/kg_status_line_font_size"

        android:drawablePadding="4dip"

        />



    <TextView

        android:id="@+id/owner_info"

        android:layout_gravity="end"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearance"

        android:textSize="@dimen/kg_status_line_font_size"

        />



    <TextView

        android:id="@+id/status1"

        android:layout_gravity="end"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearance"

        android:textSize="@dimen/kg_status_line_font_size"

        />



    <TextView

        android:id="@+id/status_security_message"

        android:layout_gravity="center"

        android:gravity="right"

        android:layout_marginTop="12dp"

        android:singleLine="false"

        android:maxLines="3"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearance"

        android:textSize="16dp"

        />

</LinearLayout>
 
 No newline at end of file

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

+7 −6
Original line number Diff line number Diff line
@@ -27,21 +27,22 @@ 
    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="27" />



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

        android:id="@+id/view_flipper"

        android:layout_height="match_parent"

        android:layout_height="0dp"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_weight="73"

        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 -->

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



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



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

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

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

<!--

**

** Copyright 2009, 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 a view that shows general status information in Keyguard. -->

<LinearLayout

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

    android:id="@+id/keyguard_status_area"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="right"

    android:orientation="vertical">



    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="0dp"

        android:layout_gravity="right">

        <TextView

            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="@dimen/kg_status_date_font_size"

            />



        <TextView

            android:id="@+id/alarm_status"

            android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="?android:attr/textAppearance"

            android:textSize="@dimen/kg_status_line_font_size"

            android:drawablePadding="4dip"

            />

    </LinearLayout>



    <TextView

        android:id="@+id/owner_info"

        android:layout_gravity="right"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearance"

        android:textSize="@dimen/kg_status_line_font_size"

        />



    <TextView

        android:id="@+id/status1"

        android:layout_gravity="right"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearance"

        android:textSize="@dimen/kg_status_line_font_size"

        />



    <TextView

        android:id="@+id/status_security_message"

        android:layout_gravity="right"

        android:layout_marginTop="4dp"

        android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearance"

        android:textSize="@dimen/kg_status_line_font_size"

        />

        

</LinearLayout>
 
 No newline at end of file

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

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ 
        android:paddingBottom="@dimen/keyguard_security_view_margin"

        android:layout_gravity="center">



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

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





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