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

Commit b3f87c24 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "bouncer: hide more text and frame less." into jb-mr1-lockscreen-dev

parents 7c6863be c0ae9e67

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,6 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/keyguard_security_height"

            android:layout_height="@dimen/keyguard_security_height"

            androidprv:layout_childType="challenge"

            androidprv:layout_childType="challenge"

            android:background="@drawable/kg_bouncer_bg_white"

            android:padding="0dp"

            android:padding="0dp"

            android:gravity="bottom|center_horizontal">

            android:gravity="bottom|center_horizontal">

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

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

core/res/res/layout/keyguard_face_unlock_view.xml

+31 −24
Original line number Original line Diff line number Diff line
@@ -31,13 +31,19 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        />

        />





    <FrameLayout

       android:id="@+id/keyguard_bouncer_frame"

       android:background="@*android:drawable/kg_bouncer_bg_white"

       android:layout_width="match_parent"

       android:layout_height="0dp"

       android:layout_weight="1"

       >

       <com.android.internal.widget.FaceUnlockView

       <com.android.internal.widget.FaceUnlockView

           android:id="@+id/face_unlock_area_view"

           android:id="@+id/face_unlock_area_view"

           android:layout_width="match_parent"

           android:layout_width="match_parent"

        android:layout_height="0dp"

           android:layout_height="match_parent"

           android:background="@*android:drawable/intro_bg"

           android:background="@*android:drawable/intro_bg"

        android:gravity="center"

           android:gravity="center">

        android:layout_weight="1">





           <View

           <View

               android:id="@+id/spotlightMask"

               android:id="@+id/spotlightMask"
@@ -57,6 +63,7 @@ 
               android:src="@*android:drawable/ic_facial_backup"

               android:src="@*android:drawable/ic_facial_backup"

           />

           />

       </com.android.internal.widget.FaceUnlockView>

       </com.android.internal.widget.FaceUnlockView>

    </FrameLayout>





    <include layout="@layout/keyguard_emergency_carrier_area"

    <include layout="@layout/keyguard_emergency_carrier_area"

        android:id="@+id/keyguard_selector_fade_container"

        android:id="@+id/keyguard_selector_fade_container"

core/res/res/layout/keyguard_password_view.xml

+38 −32
Original line number Original line Diff line number Diff line
@@ -39,6 +39,12 @@ 
    <!-- Password entry field -->

    <!-- Password entry field -->

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

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

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

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

      <FrameLayout

         android:id="@+id/keyguard_bouncer_frame"

         android:background="@*android:drawable/kg_bouncer_bg_white"

         android:layout_height="wrap_content"

         android:layout_width="match_parent"

         >

         <LinearLayout

         <LinearLayout

             android:layout_height="wrap_content"

             android:layout_height="wrap_content"

             android:layout_width="match_parent"

             android:layout_width="match_parent"
@@ -77,7 +83,7 @@ 
                 />

                 />





            </LinearLayout>

            </LinearLayout>



       </FrameLayout>

    <include layout="@layout/keyguard_emergency_carrier_area"

    <include layout="@layout/keyguard_emergency_carrier_area"

             android:id="@+id/keyguard_selector_fade_container"

             android:id="@+id/keyguard_selector_fade_container"

             android:layout_width="match_parent"

             android:layout_width="match_parent"

core/res/res/layout/keyguard_pattern_view.xml

+17 −15
Original line number Original line Diff line number Diff line
@@ -43,14 +43,17 @@ 
            android:orientation="vertical"

            android:orientation="vertical"

            android:layout_gravity="center">

            android:layout_gravity="center">





            <!-- We need MATCH_PARENT here only to force the size of the parent to be passed to

          <FrameLayout

            the pattern view for it to compute its size. This is an unusual case, caused by

             android:id="@+id/keyguard_bouncer_frame"

            LockPatternView's requirement to maintain a square aspect ratio based on the width

             android:background="@*android:drawable/kg_bouncer_bg_white"

            of the screen. -->

             android:layout_width="match_parent"

             android:layout_height="0dp"

             android:layout_weight="1"

             >

            <com.android.internal.widget.LockPatternView

            <com.android.internal.widget.LockPatternView

                android:id="@+id/lockPatternView"

                android:id="@+id/lockPatternView"

                android:layout_width="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:layout_weight="1"

                android:layout_marginEnd="8dip"

                android:layout_marginEnd="8dip"

                android:layout_marginBottom="4dip"

                android:layout_marginBottom="4dip"
@@ -58,7 +61,7 @@ 
                android:layout_gravity="center_horizontal"

                android:layout_gravity="center_horizontal"

                android:gravity="center"

                android:gravity="center"

                android:contentDescription="@string/keyguard_accessibility_pattern_area" />

                android:contentDescription="@string/keyguard_accessibility_pattern_area" />



          </FrameLayout>

          <include layout="@layout/keyguard_emergency_carrier_area"

          <include layout="@layout/keyguard_emergency_carrier_area"

              android:id="@+id/keyguard_selector_fade_container"

              android:id="@+id/keyguard_selector_fade_container"

              android:layout_width="match_parent"

              android:layout_width="match_parent"
@@ -66,7 +69,6 @@ 
              android:orientation="vertical"

              android:orientation="vertical"

              android:layout_gravity="bottom|center_horizontal"

              android:layout_gravity="bottom|center_horizontal"

              android:gravity="center_horizontal" />

              android:gravity="center_horizontal" />



        </LinearLayout>

        </LinearLayout>

    </FrameLayout>

    </FrameLayout>

core/res/res/layout/keyguard_pin_view.xml

+178 −170
Original line number Original line Diff line number Diff line
@@ -30,6 +30,14 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        />

        />

    <LinearLayout

       android:id="@+id/keyguard_bouncer_frame"

       android:background="@*android:drawable/kg_bouncer_bg_white"

       android:layout_width="match_parent"

       android:layout_height="0dp"

       android:orientation="vertical"

       android:layout_weight="1"

       >

       <LinearLayout

       <LinearLayout

          android:layout_width="match_parent"

          android:layout_width="match_parent"

          android:layout_height="0dp"

          android:layout_height="0dp"
@@ -46,7 +54,7 @@ 
               android:singleLine="true"

               android:singleLine="true"

               android:cursorVisible="false"

               android:cursorVisible="false"

               android:background="@null"

               android:background="@null"

            android:textAppearance="@android:style/TextAppearance.NumPadKey"

               android:textAppearance="@style/TextAppearance.NumPadKey"

               android:imeOptions="flagForceAscii|actionDone"

               android:imeOptions="flagForceAscii|actionDone"

               />

               />

           <ImageButton android:id="@+id/delete_button"

           <ImageButton android:id="@+id/delete_button"
@@ -201,7 +209,7 @@ 
               android:contentDescription="@string/keyboardview_keycode_enter"

               android:contentDescription="@string/keyboardview_keycode_enter"

               />

               />

       </LinearLayout>

       </LinearLayout>



    </LinearLayout>

    <include layout="@layout/keyguard_emergency_carrier_area"

    <include layout="@layout/keyguard_emergency_carrier_area"

                   android:id="@+id/keyguard_selector_fade_container"

                   android:id="@+id/keyguard_selector_fade_container"

                   android:layout_width="match_parent"

                   android:layout_width="match_parent"