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

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

release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-40... 

release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-4017779 snap-temp-L47900000064949209

Change-Id: I3562431439be2150be428fea9bf141d9b5c15904
parents bdbb5768 80c3a16e

AndroidManifest.xml

+55 −34
Original line number Diff line number Diff line
@@ -766,14 +766,14 @@ 
                android:icon="@drawable/ic_settings_notifications"

                android:exported="true"

                android:taskAffinity="">

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

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

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

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

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

                android:value="30" />

                android:value="6,10,30" />

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

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

            <meta-data android:name="com.android.settings.summary"
@@ -792,7 +792,7 @@ 
                  android:label="@string/wallpaper_settings_title"

                  android:icon="@drawable/ic_wallpaper"

                  android:theme="@android:style/Theme.NoDisplay">

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

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />

            </intent-filter>
@@ -958,11 +958,6 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

                <action android:name="com.android.settings.action.SETTINGS" />

            </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.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.ManageApplications" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1502,7 +1497,7 @@ 
        <!-- Second and third-level settings -->



        <!-- Lock screen settings -->

        <activity android:name="ConfirmDeviceCredentialActivity"

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

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter android:priority="1">
@@ -1510,9 +1505,13 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        <!-- Activity alias for compatibility -->

        <activity-alias android:name=".ConfirmDeviceCredentialActivity"

            android:targetActivity=".password.ConfirmDeviceCredentialActivity"

            android:exported="true" />



        <!-- Note this must not be exported since it authenticates the given user -->

        <activity android:name="ConfirmDeviceCredentialActivity$InternalActivity"

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

            android:exported="false"

            android:permission="android.permission.MANAGE_USERS"

            android:resizeableActivity="false"
@@ -1553,10 +1552,10 @@ 
            </intent-filter>

        </activity>



        <activity android:name="ConfirmLockPattern"

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

            android:theme="@style/GlifTheme.Light"/>



        <activity android:name="ConfirmLockPassword"

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

            android:windowSoftInputMode="stateHidden|adjustResize"

            android:theme="@style/GlifTheme.Light"/>
@@ -1566,10 +1565,10 @@ 
            android:icon="@drawable/ic_suggestion_fingerprint">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

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

                android:value="10,30" />

                android:value="4,8,30" />

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

                android:value="android.hardware.fingerprint" />

            <meta-data android:name="com.android.settings.title"
@@ -1598,17 +1597,17 @@ 
        </activity>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name="ConfirmLockPattern$InternalActivity"

        <activity android:name=".password.ConfirmLockPattern$InternalActivity"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"/>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name="ConfirmLockPassword$InternalActivity"

        <activity android:name=".password.ConfirmLockPassword$InternalActivity"

            android:exported="false"

            android:windowSoftInputMode="adjustResize"

            android:theme="@style/GlifTheme.Light"/>



        <activity android:name="SetupChooseLockGeneric"

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

            android:taskAffinity="com.android.wizard"

            android:theme="@style/GlifTheme.Light"

            android:label="@string/lock_settings_picker_title">
@@ -1618,7 +1617,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name="ChooseLockGeneric"

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

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

            android:exported="false" />
@@ -1665,27 +1664,27 @@ 
                android:resource="@string/suggested_fingerprint_lock_settings_summary" />

        </activity>



        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"

        <activity android:name=".password.ChooseLockGeneric$InternalActivity"

            android:exported="false"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

        />

            android:excludeFromRecents="true" />



        <activity android:name="SetupChooseLockPattern"

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

            android:exported="false"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name="ChooseLockPattern"

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

            android:exported="false"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name="SetupChooseLockPassword"

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

            android:exported="false"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/GlifTheme.Light"

            android:windowSoftInputMode="stateVisible|adjustResize" />



        <activity android:name="ChooseLockPassword"

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

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:windowSoftInputMode="stateVisible|adjustResize"/>
@@ -1881,6 +1880,20 @@ 
                android:value="true" />

        </activity>



        <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real

             activity is disabled to be CTS compliant. -->

        <activity

            android:name=".development.DevelopmentSettingsDisabledActivity"

            android:icon="@drawable/ic_settings_development"

            android:label="@string/development_settings_title"

            android:theme="@android:style/Theme.NoDisplay">

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

                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

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

            </intent-filter>

        </activity>



        <activity android:name="Settings$PrintSettingsActivity"

                android:label="@string/print_settings"

                android:icon="@drawable/ic_settings_print"
@@ -2374,8 +2387,6 @@ 
            </intent-filter>

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

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

            <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.users.UserSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -2774,12 +2785,12 @@ 
                  android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

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

                       android:value="com.android.settings.WifiCallingSettings" />

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

                android:value="10" />

                android:value="7,11,30" />

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

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

            <meta-data android:name="com.android.settings.summary"
@@ -2952,6 +2963,11 @@ 
                       android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />

        </activity>



        <activity android:name="Settings$LegacySupportActivity">

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

            android:value="com.android.settings.dashboard.SupportFragment"/>

        </activity>



        <!-- Information architecture host activities -->



        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
@@ -3001,17 +3017,16 @@ 
                       android:resource="@string/system_dashboard_summary"/>

        </activity>



        <activity android:name=".Settings$SupportDashboardActivity"

        <activity android:name=".dashboard.SupportDashboardActivity"

                  android:label="@string/page_tab_title_support"

                  android:icon="@drawable/ic_help"

                  android:theme="@android:style/Theme.NoDisplay"

                  android:enabled="@bool/config_support_enabled">

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

                <action android:name="com.android.settings.action.SETTINGS"/>

            </intent-filter>

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

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

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

                       android:value="com.android.settings.dashboard.SupportFragment"/>

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

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

        </activity>
@@ -3083,10 +3098,16 @@ 
            android:label="@string/camera_lift_trigger_title"

            android:icon="@drawable/ic_settings_camera"

            android:enabled="@bool/config_cameraLiftTriggerAvailable">

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

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

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

                       android:value="3,7,30" />

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

                       android:value="com.android.settings.gestures.CameraLiftTriggerSettings"/>

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

res/drawable/ic_add_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

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

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

    <path

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

        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

res/drawable/ic_battery_alert_24dp.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:viewportWidth="24.0"

        android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FF000000"

        android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z"/>

</vector>

res/drawable/ic_chevron_right_24dp.xml

0 → 100644
+27 −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:autoMirrored="true"

    android:height="24dp"

    android:width="24dp"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

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

    <path android:fillColor="#FF000000"

          android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />

</vector>

res/drawable/ic_fingerprint_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

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

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

    <path

        android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"

        android:fillColor="#000000"/>