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

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

release-request-d642586e-3e25-49f4-8b4c-acad0e3f63d8-for-git_oc-mr1-release-42...

release-request-d642586e-3e25-49f4-8b4c-acad0e3f63d8-for-git_oc-mr1-release-4249777 snap-temp-L81500000089724408

Change-Id: Iddbe99c7129c553bcd908d612ab529ae50422194
parents 1dfac22b 57c85089
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -671,13 +671,6 @@
                android:value="true" />
        </activity>

        <receiver android:name=".inputmethod.InputMethodDialogReceiver"
                android:enabled="true">
            <intent-filter>
                <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
            </intent-filter>
        </receiver>

        <activity android:name="Settings$UserDictionarySettingsActivity"
                android:label="@string/user_dict_settings_title"
                android:taskAffinity="com.android.settings"
+7 −61
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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:name="root"
    android:height="42dp"
        android:width="42dp"
    android:viewportHeight="42"
    android:viewportWidth="42" >
    <group
        android:name="ic_signal_briefcase"
        android:translateX="21.9995"
        android:translateY="25.73401" >
        <group
            android:name="ic_signal_briefcase_pivot"
            android:translateX="-23.21545"
            android:translateY="-18.86649" >
            <clip-path
                android:name="mask"
                android:pathData="M 37.8337860107,-40.3974914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 40.9884796143,40.9278411865 40.9884796143,40.9278411865 c 0.0,0.0 -2.61700439453,2.0938873291 -2.61700439453,2.0938873291 c 0.0,0.0 -41.1884460449,-40.9392852783 -41.1884460449,-40.9392852783 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" />
            <group
                android:name="cross" >
                <path
                    android:name="cross_1"
                    android:pathData="M 7.54049682617,3.9430847168 c 0.0,0.0 31.5749816895,31.4499664307 31.5749816895,31.4499664307 "
                    android:strokeColor="#FFFFFFFF"
                    android:strokeAlpha="1"
                    android:strokeWidth="3.5"
                    android:fillColor="#00000000" />
            </group>
            <group
                android:name="briefcase"
                android:translateX="23.481"
                android:translateY="18.71151" >
                <path
                    android:fillColor="#FFFFFFFF"
                    android:fillAlpha="1"
                    android:pathData="M-4.83333,-14.3333 L-7.16667,-11.8333 L-7.16667,-9.5 L-4.83333,-9.5 L-4.83333,-11.8333 L4.83333,-11.8333 L4.83333,-9.5 L7.16667,-9.5 L7.16667,-11.8333 L4.83333,-14.3333 Z" />
                <path
                    android:fillColor="#FFFFFFFF"
                    android:fillAlpha="1"
                    android:pathData="M13.1667,-9.5 L-13.1667,-9.5 C-14.5,-9.5,-15.5,-8.5,-15.5,-7.16666 L-15.5,0.00000286102 C-15.5,1.33334,-14.5,2.33334,-13.1667,2.33334 L-3.66667,2.33334 L-3.66667,0.00000286102 L3.5,0.00000286102 L3.5,2.33334 L13,2.33334 C14.3333,2.33334,15.3333,1.33334,15.3333,0 L15.3333,-7.16666 C15.5,-8.5,14.3333,-9.5,13.1667,-9.5 Z" />
        android:height="42dp"
        android:viewportWidth="42.0"
        android:viewportHeight="42.0">
    <path
                    android:fillColor="#FFFFFFFF"
                    android:fillAlpha="1"
                    android:pathData="M-3.5,7.16667 L-3.5,4.83334 L-14.3333,4.83334 L-14.3333,10.8333 C-14.3333,12.1667,-13.3333,13.1667,-12,13.1667 L11.8333,13.1667 C13.1667,13.1667,14.1667,12.1667,14.1667,10.8333 L14.1667,4.83334 L3.5,4.83334 L3.5,7.16667 L-3.5,7.16667 Z" />
            </group>
        </group>
    </group>
        android:pathData="M40.25,38.04l-2.56,-2.56L12.62,10.41L5.69,3.48l-2.2,2.2l4.73,4.72H7.09c-1.94,0 -3.48,1.56 -3.48,3.5L3.59,33.16c0,1.94 1.56,3.5 3.5,3.5h27.37l3.59,3.59L40.25,38.04zM38.5,13.91c0.09,-1.94 -1.47,-3.5 -3.41,-3.41h-7V6.91c0,-1.94 -1.56,-3.5 -3.5,-3.41h-7c-1.94,-0.09 -3.5,1.47 -3.5,3.41v0.56l24.41,24.5V13.91zM24.59,10.5H17.5V6.91h7.09V10.5z"
        android:fillColor="#FFFFFF"/>
</vector>
+12 −4
Original line number Diff line number Diff line
@@ -108,10 +108,18 @@
                android:gravity="center"
                android:orientation="vertical">

                <com.android.setupwizardlib.view.FillContentLayout
                    android:layout_width="@dimen/fingerprint_progress_bar_max_size"
                    android:layout_height="@dimen/fingerprint_progress_bar_max_size"
                    android:paddingTop="0dp"
                    android:paddingBottom="0dp"
                    android:layout_marginVertical="24dp">

                    <include layout="@layout/fingerprint_enroll_enrolling_content"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_gravity="center" />
                </com.android.setupwizardlib.view.FillContentLayout>

                <TextView
                    style="@style/TextAppearance.FingerprintErrorText"
+21 −9
Original line number Diff line number Diff line
@@ -16,19 +16,31 @@
** limitations under the License.
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:clipToPadding="false"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:padding="6dip">
    <ImageView
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
    <FrameLayout
        android:id="@+id/icon_frame"
        style="@style/preference_icon_frame"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:gravity="start|center_vertical"
        android:paddingEnd="12dp"
        android:paddingTop="4dp"
        android:paddingBottom="4dp">
        <android.support.v7.internal.widget.PreferenceImageView
            android:id="@android:id/icon"
            android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:adjustViewBounds="true"
        android:padding="6dip"
        android:duplicateParentState="true"
        />
            android:layout_height="wrap_content"
            settings:maxWidth="48dp"
            settings:maxHeight="48dp" />
    </FrameLayout>
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,15 @@
        android:layout_height="wrap_content"
        android:text="@string/lockpassword_cancel_label" />


    <!-- left : clear -->
    <Button android:id="@+id/clear_button"
        style="@style/SuwGlifButton.Secondary"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:visibility="gone"
        android:text="@string/lockpassword_clear_label" />

    <Space
        android:layout_width="0dp"
        android:layout_height="0dp"
Loading