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

Commit 6b88cdfb authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Remove dead code #8: Remove old keyguard "bouncer" 

Also squashes KeyguardViewBase and KeyguardSimpleHostView into
KeyguardHostView, uses a constant for the user activity timeout
(custom value no longer used).

Change-Id: I919b7d3de1dd1590b20e0f14f0e193ee2b3dc21e
parent a9ef7929

packages/Keyguard/res/layout/keyguard_bouncer.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


    <include

        style="@style/BouncerSecurityContainer"

        layout="@layout/keyguard_simple_host_view"

        layout="@layout/keyguard_host_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content" />

</FrameLayout>

packages/Keyguard/res/layout/keyguard_simple_host_view.xml→packages/Keyguard/res/layout/keyguard_host_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


<!-- This is the host view that generally contains two sub views: the widget view

    and the security view. -->

<com.android.keyguard.KeyguardSimpleHostView

<com.android.keyguard.KeyguardHostView

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

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

    android:id="@+id/keyguard_host_view"
@@ -48,5 +48,5 @@ 
        </com.android.keyguard.KeyguardSecurityViewFlipper>

    </com.android.keyguard.KeyguardSecurityContainer>



</com.android.keyguard.KeyguardSimpleHostView>

</com.android.keyguard.KeyguardHostView>

packages/Keyguard/res/layout/keyguard_password_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 


    <!-- Password entry field -->

      <FrameLayout

         android:id="@+id/keyguard_bouncer_frame"

         android:layout_height="wrap_content"

         android:layout_width="280dp"

         android:layout_gravity="center_horizontal"

packages/Keyguard/res/layout/keyguard_pattern_view.xml

+3 −10
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
        android:clipToPadding="false">



        <LinearLayout

            android:id="@+id/container"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:orientation="vertical"
@@ -53,18 +54,10 @@ 
                android:layout_height="wrap_content"

               />



          <FrameLayout

             android:id="@+id/keyguard_bouncer_frame"

             android:layout_width="match_parent"

             android:layout_height="0dp"

             android:layout_weight="1"

             android:clipChildren="false"

             android:clipToPadding="false"

             >

            <com.android.internal.widget.LockPatternView

                android:id="@+id/lockPatternView"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:layout_marginEnd="8dip"

                android:layout_marginBottom="4dip"
@@ -74,7 +67,7 @@ 
                android:contentDescription="@string/keyguard_accessibility_pattern_area"

                android:clipChildren="false"

                android:clipToPadding="false" />

          </FrameLayout>



          <include layout="@layout/keyguard_eca"

              android:id="@+id/keyguard_selector_fade_container"

              android:layout_width="match_parent"

packages/Keyguard/res/layout/keyguard_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
             android:layout_height="wrap_content"

            />

    <LinearLayout

            android:id="@+id/keyguard_bouncer_frame"

            android:id="@+id/container"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:orientation="vertical"