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

Commit 454ce75a authored by Benjamin Franz's avatar Benjamin Franz Committed by Android (Google) Code Review
Browse files

Merge "Add background image for work challenge"

parents 9ceeeb6c 194300df

res/drawable-nodpi/work_challenge_background.png

0 → 100644
+243 KiB
Loading image diff...

res/layout-land/confirm_lock_password.xml

+73 −65
Original line number Diff line number Diff line
@@ -13,11 +13,18 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" >



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



    <LinearLayout

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

        android:id="@+id/topLayout"

        android:orientation="vertical"

    android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <TextView
@@ -91,3 +98,4 @@ 
        </FrameLayout>



    </LinearLayout>

</FrameLayout>
 
 No newline at end of file

res/layout-land/confirm_lock_pattern.xml

+89 −82
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" >



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



    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

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

        android:id="@+id/topLayout"
@@ -112,4 +119,4 @@ 
        </LinearLayout>



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

</FrameLayout>
 
 No newline at end of file

res/layout/confirm_lock_background_base.xml

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

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

-->

<ImageView

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

    android:id="@+id/background_image"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scaleType="centerCrop" />
 
 No newline at end of file

res/layout/confirm_lock_password_base.xml

+75 −67
Original line number Diff line number Diff line
@@ -13,11 +13,18 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" >



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



    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

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

        android:id="@+id/topLayout"

        android:orientation="vertical"

    android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <TextView
@@ -89,3 +96,4 @@ 
            android:visibility="gone"/>



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

</FrameLayout>
 
 No newline at end of file