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

Commit a51e27bc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-31f776a2-f093-4abe-9235-1702f8bafc9d-for-git_oc-dr1-release-40... 

release-request-31f776a2-f093-4abe-9235-1702f8bafc9d-for-git_oc-dr1-release-4054002 snap-temp-L42500000069020014

Change-Id: I7c88c07e23ee1de51f56ecb2b82a9535da432081
parents 9e02dc79 052095a7

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
    <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>

    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>

    <uses-permission android:name="android.permission.DELETE_PACKAGES"/>

    <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>



    <application android:label="@string/settings_label"

            android:icon="@drawable/ic_launcher_settings"
@@ -1498,6 +1499,7 @@ 
            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter android:priority="1">

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />

                <action android:name="android.app.action.CONFIRM_FRP_CREDENTIAL" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>
@@ -2530,8 +2532,6 @@ 
            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.apps"/>

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/summary_empty"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.ConfigureNotificationSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

res/drawable/ic_password.xml

0 → 100644
+34 −0
Original line number 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="24dp"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M21.5,9.39l-1.63,0l0.81,-1.42l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0z" />

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M13.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M6.68,7.97l-0.86,-0.5l-0.82,1.42l-0.82,-1.42l-0.86,0.5l0.81,1.42l-1.63,0l0,1l1.63,0l-0.81,1.41l0.86,0.5l0.82,-1.41l0.82,1.41l0.86,-0.5l-0.81,-1.41l1.63,0l0,-1l-1.63,0z" />

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M21,17.89H3c-0.28,0 -0.5,-0.22 -0.5,-0.5v-1c0,-0.28 0.22,-0.5 0.5,-0.5h18c0.28,0 0.5,0.22 0.5,0.5v1C21.5,17.66 21.28,17.89 21,17.89z" />

</vector>

res/drawable/ic_pattern.xml

0 → 100644
+37 −0
Original line number 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="24dp"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M4,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M4,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M20,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M20,18c-0.93,0 -1.7,0.64 -1.93,1.5h-4.14c-0.22,-0.86 -1,-1.5 -1.93,-1.5s-1.7,0.64 -1.93,1.5H5.93c-0.05,-0.18 -0.12,-0.35 -0.21,-0.51l5.28,-5.28C11.29,13.89 11.63,14 12,14c1.1,0 2,-0.9 2,-2c0,-0.37 -0.11,-0.71 -0.28,-1.01l5.28,-5.28C19.29,5.89 19.63,6 20,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C12.71,10.11 12.37,10 12,10c-1.1,0 -2,0.9 -2,2c0,0.37 0.11,0.71 0.28,1.01l-5.28,5.28C4.71,18.11 4.37,18 4,18c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c0.93,0 1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5s1.7,-0.64 1.93,-1.5h4.14c0.22,0.86 1,1.5 1.93,1.5c1.1,0 2,-0.9 2,-2S21.1,18 20,18z" />

</vector>

res/drawable/ic_pin.xml

0 → 100644
+25 −0
Original line number 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="24dp"

    android:height="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0">

    <path

        android:fillColor="?attr/suwListItemIconColor"

        android:pathData="M20,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,6A2,2 0,0 0,20 4ZM7.1,15L5.9,15L5.9,10.2L4.7,10.2L4.7,9L7.1,9v6ZM13.2,11.4A1.2,1.2 0,0 1,12 12.6L10.8,12.6v1.2h2.4L13.2,15L9.6,15L9.6,12.6a1.2,1.2 0,0 1,1.2 -1.2L12,11.4L12,10.2L9.6,10.2L9.6,9L12,9a1.2,1.2 0,0 1,1.2 1.2v1.2ZM19.3,11.1a0.9,0.9 0,0 1,-0.9 0.9,0.9 0.9,0 0,1 0.9,0.9v0.9A1.2,1.2 0,0 1,18.1 15L15.7,15L15.7,13.8h2.4L18.1,12.6L16.9,12.6L16.9,11.4h1.2L18.1,10.2L15.7,10.2L15.7,9h2.4a1.2,1.2 0,0 1,1.2 1.2v0.9Z" />

</vector>

res/layout-land/fingerprint_enroll_finish.xml

+32 −11
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout="@layout/suw_glif_blank_template"

    style="?attr/fingerprint_layout_theme">



    <LinearLayout
@@ -28,18 +29,34 @@ 
        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:clipToPadding="false"

        android:clipChildren="false"

        android:paddingBottom="0dp">

        android:clipChildren="false">



        <LinearLayout

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:layout_height="match_parent"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:orientation="vertical">



            <ImageView

                android:id="@+id/suw_layout_icon"

                style="@style/SuwGlifIcon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="0dp"

                android:layout_marginRight="0dp"

                android:contentDescription="@null"

                android:src="@drawable/ic_fingerprint_header"/>



            <TextView

                android:id="@+id/suw_layout_title"

                style="@style/SuwGlifHeaderTitle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginLeft="0dp"

                android:layout_marginRight="0dp"/>



            <TextView

                android:id="@+id/message"

                style="@style/SuwDescription.Glif"
@@ -57,6 +74,11 @@ 
                android:textColor="?android:attr/textColorSecondary"

                android:visibility="gone" />



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"
@@ -89,21 +111,20 @@ 


        </LinearLayout>



        <FrameLayout

        <com.android.setupwizardlib.view.FillContentLayout

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical">

            android:layout_height="match_parent">



            <ImageView

                android:id="@+id/fingerprint_in_app_indicator"

                android:layout_width="@dimen/fingerprint_in_app_indicator_size"

                android:layout_height="@dimen/fingerprint_in_app_indicator_size"

                android:layout_gravity="center_horizontal"

                style="@style/SuwContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:contentDescription="@android:string/fingerprint_icon_content_description"

                android:src="@drawable/fp_app_indicator" />



        </FrameLayout>

        </com.android.setupwizardlib.view.FillContentLayout>



    </LinearLayout>