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

Commit fac17cc7 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Introduce transparent bars to the keyguard." into klp-dev

parents d3fbba15 257f283b

core/res/res/values/config.xml

+4 −1
Original line number Diff line number Diff line
@@ -582,9 +582,12 @@ 
    <!-- Don't show lock screen before unlock screen (PIN/pattern/password) -->

    <bool name="config_enableLockBeforeUnlockScreen">false</bool>



    <!-- Diable lockscreen rotation by default -->

    <!-- Disable lockscreen rotation by default -->

    <bool name="config_enableLockScreenRotation">false</bool>



    <!-- Disable lockscreen transparent bars by default -->

    <bool name="config_enableLockScreenTransparentBars">false</bool>



    <!-- Enable puk unlockscreen by default.

         If unlock screen is disabled, the puk should be unlocked through Emergency Dialer -->

    <bool name="config_enable_puk_unlock_screen">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,7 @@ 
  <java-symbol type="bool" name="config_disableMenuKeyInLockScreen" />

  <java-symbol type="bool" name="config_enableLockBeforeUnlockScreen" />

  <java-symbol type="bool" name="config_enableLockScreenRotation" />

  <java-symbol type="bool" name="config_enableLockScreenTransparentBars" />

  <java-symbol type="bool" name="config_lidControlsSleep" />

  <java-symbol type="bool" name="config_reverseDefaultRotation" />

  <java-symbol type="bool" name="config_showNavigationBar" />

packages/Keyguard/res/layout-land/keyguard_host_view.xml

+0 −5
Original line number Diff line number Diff line
@@ -51,11 +51,6 @@ 
            androidprv:layout_maxHeight="480dp" />

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



        <View android:layout_width="match_parent"

              android:layout_height="match_parent"

              androidprv:layout_childType="scrim"

              android:background="#99000000" />



        <com.android.keyguard.KeyguardSecurityContainer

            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

packages/Keyguard/res/layout-port/keyguard_host_view.xml

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ 
                android:layout_gravity="center"/>

        </FrameLayout>



        <View android:layout_width="match_parent"

              android:layout_height="match_parent"

              androidprv:layout_childType="scrim"

              android:background="#99000000" />



        <com.android.keyguard.KeyguardSecurityContainer

            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml

+0 −5
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ 


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



        <View android:layout_width="match_parent"

              android:layout_height="match_parent"

              androidprv:layout_childType="scrim"

              android:background="#99000000" />



        <com.android.keyguard.KeyguardSecurityContainer

            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"