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

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

Snap for 5443223 from 6010c3a9 to qt-release 

Change-Id: Idba83fbede5d80ba60726ce870fd7823c3b218e1
parents 2604451a 6010c3a9

.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
.idea/

*.iml

AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ 
        <!-- Lock screen settings -->

        <activity android:name=".password.ConfirmDeviceCredentialActivity"

            android:exported="true"

            android:taskAffinity=".password.ConfirmDeviceCredentialActivity"

            android:taskAffinity="com.android.settings.workmode"

            android:theme="@android:style/Theme.Translucent.NoTitleBar">

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

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
@@ -1493,7 +1493,7 @@ 
            android:exported="false"

            android:permission="android.permission.MANAGE_USERS"

            android:resizeableActivity="false"

            android:taskAffinity=".password.ConfirmDeviceCredentialActivity"

            android:taskAffinity="com.android.settings.workmode"

            android:theme="@android:style/Theme.Translucent.NoTitleBar">

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

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" />
@@ -2810,6 +2810,7 @@ 


        <activity android:name=".enterprise.ActionDisabledByAdminDialog"

                android:theme="@style/Transparent"

                android:taskAffinity="com.android.settings.enterprise"

                android:excludeFromRecents="true"

                android:launchMode="singleTop">

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

res/drawable/ic_check_circle_green_24dp.xml→res/drawable/ic_arrow_back.xml

+9 −9
Original line number Diff line number Diff line 
<!--

Copyright (C) 2017 The Android Open Source Project

    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.
@@ -16,10 +16,10 @@ Copyright (C) 2017 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#0F9D58"

        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10

        ,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>

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

        android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />

</vector>

res/drawable/ic_battery_status_bad_24dp.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="?attr/batteryBadColor"

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

        android:pathData="M15,14l-2,0l0,2l-2,0l0,-2l-2,0l0,-2l2,0l0,-2l2,0l0,2l2,0z"/>

    <path

        android:fillColor="?attr/batteryBadColor"

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

        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>

</vector>

res/drawable/ic_battery_status_good_24dp.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="?attr/batteryGoodColor"

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

        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>

    <path

        android:fillColor="?attr/batteryGoodColor"

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

        android:pathData="M16.1,11.1l-1.4,-1.5l-3.9,3.9l-1.5,-1.4l-1.4,1.4l2.9,2.9z"/>

</vector>