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

Commit 117365db authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Show padlock on AOD 

Bug: 111405682
Test: manual
Change-Id: I1e41cc332d676d977447327b75737795713f3040
parent 2e189585

packages/SystemUI/res/drawable/ic_lock.xml

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->



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

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0">

    <path

        android:pathData="M20.25,6.89C20.25,4.62 18.36,2.75 16,2.75C13.64,2.75 11.75,4.62 11.75,6.89V11.25H20.25V6.89ZM21.75,11.25V6.89C21.75,3.76 19.16,1.25 16,1.25C12.84,1.25 10.25,3.76 10.25,6.89V11.25H10C8.48,11.25 7.25,12.48 7.25,14V26C7.25,27.52 8.48,28.75 10,28.75H22C23.52,28.75 24.75,27.52 24.75,26V14C24.75,12.48 23.52,11.25 22,11.25H21.75ZM10,12.75C9.31,12.75 8.75,13.31 8.75,14V26C8.75,26.69 9.31,27.25 10,27.25H22C22.69,27.25 23.25,26.69 23.25,26V14C23.25,13.31 22.69,12.75 22,12.75H10ZM18,20C18,21.1 17.1,22 16,22C14.9,22 14,21.1 14,20C14,18.9 14.9,18 16,18C17.1,18 18,18.9 18,20Z"

        android:fillType="evenOdd"

        android:fillColor="?attr/wallpaperTextColor"/>

</vector>

packages/SystemUI/res/drawable/ic_lock_24dp.xml

deleted100644 → 0
+0 −25
Original line number Original line Diff line number Diff line 
<!--

Copyright (C) 2017 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.

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="?attr/wallpaperTextColor"

        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM12.0,17.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0c1.1,0.0 2.0,0.9 2.0,2.0S13.1,17.0 12.0,17.0zM15.1,8.0L8.9,8.0L8.9,6.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1L15.1,8.0z"/>

</vector>

packages/SystemUI/res/drawable/ic_lock_open.xml

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->



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

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0">

    <path

        android:pathData="M21.75,6.89C21.75,4.62 23.64,2.75 26,2.75C28.36,2.75 30.25,4.62 30.25,6.89V12H31.75V6.89C31.75,3.76 29.16,1.25 26,1.25C22.84,1.25 20.25,3.76 20.25,6.89V11.25H10C8.48,11.25 7.25,12.48 7.25,14V26C7.25,27.52 8.48,28.75 10,28.75H22C23.52,28.75 24.75,27.52 24.75,26V14C24.75,12.48 23.52,11.25 22,11.25H21.75V6.89ZM10,12.75C9.31,12.75 8.75,13.31 8.75,14V26C8.75,26.69 9.31,27.25 10,27.25H22C22.69,27.25 23.25,26.69 23.25,26V14C23.25,13.31 22.69,12.75 22,12.75H10ZM18,20C18,21.1 17.1,22 16,22C14.9,22 14,21.1 14,20C14,18.9 14.9,18 16,18C17.1,18 18,18.9 18,20Z"

        android:fillType="evenOdd"

        android:fillColor="?attr/wallpaperTextColor"/>

</vector>

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ 
        android:layout_width="@dimen/keyguard_affordance_width"

        android:layout_width="@dimen/keyguard_affordance_width"

        android:layout_height="@dimen/keyguard_affordance_height"

        android:layout_height="@dimen/keyguard_affordance_height"

        android:layout_gravity="bottom|center_horizontal"

        android:layout_gravity="bottom|center_horizontal"

        android:src="@drawable/ic_lock_24dp"

        android:src="@drawable/ic_lock"

        android:contentDescription="@string/accessibility_unlock_button"

        android:contentDescription="@string/accessibility_unlock_button"

        android:scaleType="center" />

        android:scaleType="center" />

packages/SystemUI/res/values/dimens.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -645,10 +645,6 @@ 
    <dimen name="keyguard_affordance_height">56dp</dimen>

    <dimen name="keyguard_affordance_height">56dp</dimen>

    <dimen name="keyguard_affordance_width">56dp</dimen>

    <dimen name="keyguard_affordance_width">56dp</dimen>





    <!-- The width/height of the phone/camera/unlock icon drawable on keyguard. -->

    <dimen name="keyguard_affordance_icon_height">24dp</dimen>

    <dimen name="keyguard_affordance_icon_width">24dp</dimen>



    <dimen name="keyguard_indication_margin_bottom">65dp</dimen>

    <dimen name="keyguard_indication_margin_bottom">65dp</dimen>





    <!-- The text size for battery level -->

    <!-- The text size for battery level -->