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

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

Snap for 5533229 from 21dbfce6 to qt-release

Change-Id: Ic0c62fefa8b4ffcf7f37b740143e0e1811d9be81
parents a0a92911 21dbfce6
Loading
Loading
Loading
Loading
+24 −6
Original line number Diff line number Diff line
@@ -848,6 +848,23 @@
            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
        </activity>

        <activity android:name=".wallpaper.StyleSuggestionActivity"
                  android:label="@string/style_suggestion_title"
                  android:icon="@drawable/ic_theme"
                  android:theme="@android:style/Theme.NoDisplay">
            <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.title"
                       android:resource="@string/style_suggestion_title" />
            <meta-data android:name="com.android.settings.summary"
                       android:resource="@string/style_suggestion_summary" />
            <meta-data android:name="com.android.settings.dismiss"
                       android:value="3,7,30" />
            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
        </activity>

        <activity
            android:name="Settings$ZenModeScheduleRuleSettingsActivity"
            android:exported="true"
@@ -1341,14 +1358,15 @@
            </intent-filter>
        </activity>

        <activity-alias android:name="SetProfileOwner"
                        android:label="@string/profile_owner_add_title"
                        android:targetActivity=".applications.specialaccess.deviceadmin.DeviceAdminAdd">
        <activity android:name=".applications.specialaccess.deviceadmin.ProfileOwnerAdd"
                  android:excludeFromRecents="true"
                  android:theme="@style/Transparent"
                  android:clearTaskOnLaunch="true">
            <intent-filter android:priority="1000">
                <action android:name="android.app.action.SET_PROFILE_OWNER" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity-alias>
        </activity>

        <activity
            android:name="Settings$UsageAccessSettingsActivity"
+1 −1
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ asapperstein@google.com
asargent@google.com
dehboxturtle@google.com
dhnishi@google.com
dling@google.com
edgarwang@google.com
emilychuang@google.com
jackqdyulei@google.com
lindatseng@google.com
mfritze@google.com
rafftsai@google.com
tmfang@google.com
Loading