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

Commit 7868acfa authored by Alex Johnston's avatar Alex Johnston
Browse files

Update work profile lock in Settings to latest spec

* Updated FrameLayout of work profile lock in Settings to use GlifLayout
* Removed old background image of work profile lock
* Updated text for PIN, password and pattern
* Added enterprise logo to work profile lock

Bug: 141290838
Test: Manual testing
      atest com.android.settings.password

Change-Id: Ie09974857b6c76a182a8075b9e1964a2e0af0de9
parent 1772ec00
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 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="24dp"
        android:height="24dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
        android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"
        android:fillColor="?android:attr/colorPrimary"/>
</vector>
 No newline at end of file
+79 −62
Original line number Diff line number Diff line
@@ -13,59 +13,57 @@
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<FrameLayout
<com.google.android.setupdesign.GlifLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/setup_wizard_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:importantForAutofill="noExcludeDescendants">
    android:icon="@drawable/ic_enterprise"
    android:layout="@layout/sud_glif_blank_template">

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

    <LinearLayout
    <!--common_typos_disable-->
    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
        android:id="@+id/topLayout"
        android:orientation="vertical"
        android:orientation="horizontal"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <TextView
            style="@*android:style/TextAppearance.DeviceDefault.Title"
            android:id="@+id/headerText"
            android:layout_marginStart="24dp"
            android:layout_marginEnd="24dp"
            android:layout_marginTop="12dp"
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical">

            <ImageView
                android:id="@+id/sud_layout_icon"
                style="@style/SudGlifIcon"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
            android:textColor="?android:attr/colorAccent"/>
                android:layout_gravity="?attr/sudGlifHeaderGravity"
                android:src="@drawable/ic_enterprise" />

            <TextView
            style="@*android:style/TextAppearance.DeviceDefault.Body1"
            android:id="@+id/sud_layout_description"
            android:layout_marginStart="24dp"
            android:layout_marginEnd="24dp"
            android:layout_marginTop="8dp"
            android:layout_width="wrap_content"
                android:id="@+id/headerText"
                style="@style/SudGlifHeaderTitle"
                android:layout_width="match_parent"
                android:layout_height="wrap_content" />

        <FrameLayout
            <TextView
                android:id="@+id/sud_layout_description"
                style="@style/SudDescription.Glif"
                android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1">

            <Button
                style="@android:style/Widget.Material.Button.Borderless"
                android:id="@+id/cancelButton"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="start|bottom"
                android:text="@string/cancel"
                android:layout_marginStart="8dp"
                android:layout_marginEnd="8dp"
                android:layout_marginBottom="14dp"/>
                android:layout_marginStart="?attr/sudMarginSides"
                android:layout_marginEnd="?attr/sudMarginSides" />
        </LinearLayout>

        <Space
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1" />

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
            android:gravity="center_horizontal"
            android:orientation="vertical">

@@ -73,21 +71,40 @@
                android:id="@+id/password_entry"
                android:layout_width="208dp"
                android:layout_height="wrap_content"
                android:layout_gravity="center_horizontal"
                android:inputType="textPassword"
                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
                android:gravity="center"
                style="@style/TextAppearance.PasswordEntry"/>

                <TextView style="@style/TextAppearance.ErrorText"
            <TextView
                style="@style/TextAppearance.ErrorText"
                android:accessibilityLiveRegion="polite"
                android:id="@+id/errorText"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                    android:layout_marginBottom="10dp"/>
                android:layout_marginTop="8dp"
                android:layout_marginStart="12dp"
                android:layout_marginEnd="12dp"/>

        </LinearLayout>

        </FrameLayout>
        <Space
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1" />

    </LinearLayout>
</FrameLayout>
 No newline at end of file
        <Button
            android:id="@+id/cancelButton"
            style="@style/SudGlifButton.Secondary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="?attr/sudMarginSides"
            android:layout_marginEnd="?attr/sudMarginSides"
            android:layout_marginBottom="80dp"
            android:layout_gravity="center_horizontal"
            android:text="@string/cancel" />

    <!--common_typos_disable-->
    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.google.android.setupdesign.GlifLayout>
 No newline at end of file
+68 −70
Original line number Diff line number Diff line
@@ -13,83 +13,67 @@
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<FrameLayout
<com.google.android.setupdesign.GlifLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/setup_wizard_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent" >

    <include layout="@layout/confirm_lock_background_base" />
    android:layout_height="match_parent"
    android:icon="@drawable/ic_enterprise"
    android:layout="@layout/sud_glif_blank_template">

    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/topLayout"
        android:orientation="horizontal"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <ScrollView
            android:layout_width="0dp"
            android:layout_height="match_parent"
        android:clipChildren="false"
        android:clipToPadding="false">
            android:layout_weight="1"
            android:fillViewport="true">

            <LinearLayout
            android:layout_width="0dp"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
            android:layout_weight="1"
            android:orientation="vertical">
                android:orientation="vertical"
                android:paddingBottom="24dp">

            <TextView
                style="@*android:style/TextAppearance.DeviceDefault.Headline"
                android:id="@+id/headerText"
                android:layout_marginStart="32dp"
                android:layout_marginEnd="32dp"
                <ImageView
                    android:id="@+id/sud_layout_icon"
                    style="@style/SudGlifIcon"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                android:textColor="?android:attr/colorAccent"/>
                    android:layout_gravity="?attr/sudGlifHeaderGravity"
                    android:src="@drawable/ic_enterprise" />

                <TextView
                style="@*android:style/TextAppearance.DeviceDefault.Body1"
                android:id="@+id/sud_layout_description"
                android:layout_marginStart="32dp"
                android:layout_marginEnd="32dp"
                android:layout_marginTop="12dp"
                android:layout_width="wrap_content"
                    android:id="@+id/headerText"
                    style="@style/SudGlifHeaderTitle"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content" />

                <TextView
                    android:id="@+id/sud_layout_description"
                    style="@style/SudDescription.Glif"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="?attr/sudMarginSides"
                    android:layout_marginEnd="?attr/sudMarginSides" />x

                <Button
                style="@android:style/Widget.Material.Button.Borderless"
                    android:id="@+id/cancelButton"
                    style="@style/SetupWizardButton.Negative"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                android:text="@string/cancel"
                android:layout_marginStart="16dp"
                android:layout_marginEnd="16dp"
                android:layout_marginTop="16dp"/>
        </LinearLayout>

        <LinearLayout
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:orientation="horizontal"
            android:clipChildren="false"
            android:clipToPadding="false">

            <View
                android:id="@+id/leftSpacer"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="0.4"/>

            <FrameLayout
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:clipChildren="false"
                android:clipToPadding="false">
                    android:layout_marginStart="?attr/sudMarginSides"
                    android:layout_marginEnd="?attr/sudMarginSides"
                    android:text="@string/cancel" />

                <com.android.internal.widget.LockPatternView
                    android:id="@+id/lockPattern"
                <Space
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:layout_gravity="center"/>
                    android:layout_height="0dp"
                    android:layout_weight="1" />

                <TextView
                    style="@style/TextAppearance.ErrorText"
@@ -97,16 +81,30 @@
                    android:id="@+id/errorText"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom|center_horizontal"
                    android:layout_marginBottom="24dp"/>
            </FrameLayout>
                    android:layout_marginStart="?attr/sudMarginSides"
                    android:layout_marginEnd="?attr/sudMarginSides"
                    android:layout_marginBottom="24dp"
                    android:gravity="center_vertical"/>

            <View
                android:id="@+id/rightSpacer"
            </LinearLayout>

        </ScrollView>

        <com.google.android.setupdesign.view.FillContentLayout
            style="@style/LockPatternContainerStyle"
            android:layout_width="0dp"
            android:layout_height="match_parent"
                android:layout_weight="1"/>
        </LinearLayout>
            android:layout_weight="1"
            android:paddingStart="0dp">

            <com.android.internal.widget.LockPatternView
                android:id="@+id/lockPattern"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_gravity="center" />

        </com.google.android.setupdesign.view.FillContentLayout>

    </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</FrameLayout>
</com.google.android.setupdesign.GlifLayout>
+4 −3
Original line number Diff line number Diff line
@@ -14,15 +14,16 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
<FrameLayout
<com.google.android.setupdesign.GlifLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/setup_wizard_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:importantForAutofill="noExcludeDescendants">
    android:layout="@layout/sud_glif_blank_template">

    <include
        layout="@layout/confirm_lock_password_base"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_gravity="center_horizontal" />
</FrameLayout>
</com.google.android.setupdesign.GlifLayout>
+9 −5
Original line number Diff line number Diff line
@@ -13,12 +13,16 @@
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.setupdesign.GlifLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/setup_wizard_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:layout="@layout/sud_glif_blank_template">

    <include layout="@layout/confirm_lock_pattern_base"
    <include
        layout="@layout/confirm_lock_pattern_base"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_gravity="center_horizontal" />
</FrameLayout>
</com.google.android.setupdesign.GlifLayout>
Loading