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

Commit 92e28350 authored by Brad Stenning's avatar Brad Stenning
Browse files

Move car keyguard values to CarSystemUI 

Bug:117882433

Test: Manual
Change-Id: I4457848115c75eaa34d32d1585043722c4cc4a7a
(cherry picked from commit ad3589325735d7b7e624e99cd1266959aab949c7)
parent 8666430e

packages/CarSystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ android_app { 
        ],

    },

    resource_dirs: [

        "res-keyguard",

        "res",

    ],

packages/CarSystemUI/res-keyguard/drawable/ic_backspace.xml

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

<!--

  Copyright 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="36dp"

        android:height="36dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59L17.59,17L14,13.41L10.41,17L9,15.59zM21,6H8l-4.5,6L8,18h13V6M21,4c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H8c-0.63,0 -1.22,-0.3 -1.6,-0.8L1,12l5.4,-7.2C6.78,4.3 7.37,4 8,4H21L21,4z"/>

</vector>

packages/CarSystemUI/res-keyguard/drawable/ic_done.xml

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

<!--

  Copyright 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="36dp"

        android:height="36dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,16.2l-3.5,-3.5a0.984,0.984 0,0 0,-1.4 0,0.984 0.984,0 0,0 0,1.4l4.19,4.19c0.39,0.39 1.02,0.39 1.41,0L20.3,7.7a0.984,0.984 0,0 0,0 -1.4,0.984 0.984,0 0,0 -1.4,0L9,16.2z"/>

</vector>

packages/CarSystemUI/res-keyguard/drawable/keyguard_button_background.xml

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

<!--

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

-->



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

    <item android:state_pressed="true">

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/car_button_radius"/>

            <solid android:color="#131315"/>

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/car_button_radius"/>

            <solid android:color="@color/button_background"/>

        </shape>

    </item>

</selector>

packages/CarSystemUI/res-keyguard/layout-land/keyguard_pattern_view.xml

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

<!--

**

** Copyright 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.

*/

-->



<!-- Car customizations

     - Added title "Enter your Pattern" at the top

     - Hid the emergency call at the bottom

-->



<com.android.keyguard.KeyguardPatternView

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

    android:id="@+id/keyguard_pattern_view"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingHorizontal="@dimen/car_margin">



    <FrameLayout

        android:layout_height="match_parent"

        android:layout_width="0dp"

        android:layout_weight="1">



        <com.android.internal.widget.LockPatternView

            android:id="@+id/lockPatternView"

            android:layout_width="@dimen/keyguard_pattern_dimension"

            android:layout_height="@dimen/keyguard_pattern_dimension"

            android:layout_gravity="center"/>

    </FrameLayout>



    <LinearLayout

        android:id="@+id/container"

        android:layout_height="match_parent"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:orientation="vertical"

        android:gravity="center_vertical">



        <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/car_padding_2"

            android:gravity="center"

            android:textColor="@android:color/white"

            android:textSize="@dimen/car_body1_size"

            android:text="@string/keyguard_enter_your_pattern" />



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



        <Button

            android:id="@+id/cancel_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            style="@style/KeyguardButton"

            android:text="@string/cancel"/>



        <include layout="@layout/keyguard_eca"

            android:id="@+id/keyguard_selector_fade_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_gravity="bottom|center_horizontal"

            android:gravity="center_horizontal"

            android:visibility="gone" />

    </LinearLayout>



</com.android.keyguard.KeyguardPatternView>