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

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

release-request-703268f3-975f-4a98-83d7-cbf58019eda0-for-git_oc-mr1-release-40... 

release-request-703268f3-975f-4a98-83d7-cbf58019eda0-for-git_oc-mr1-release-4067152 snap-temp-L75700000070444922

Change-Id: I7311c89a44a26b69a6176980220029a64c8ecd7d
parents f360b4ab 73fc34b7

AndroidManifest.xml

+27 −8
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ 
        <activity android:name=".search.SearchActivity"

                  android:label="@string/search_settings"

                  android:icon="@drawable/ic_search_history"

                  android:parentActivityName="Settings">

                  android:parentActivityName="Settings"

                  android:theme="@style/Theme.Settings.NoActionBar">

        </activity>



        <!-- Top-level settings -->
@@ -770,7 +771,7 @@ 
            <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="6,10,30" />

                android:value="8,12,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"
@@ -791,12 +792,30 @@ 
                  android:theme="@android:style/Theme.NoDisplay">

            <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.title"

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

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

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

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

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

        </activity>



        <activity android:name=".support.NewDeviceIntroSuggestionActivity"

                  android:label="@string/new_device_suggestion_title"

                  android:icon="@drawable/ic_new_releases_24dp"

                  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.dismiss"

                       android:value="0,4" />

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

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

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

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

        </activity>



        <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
@@ -1566,7 +1585,7 @@ 
                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

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

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

                android:value="5,9,30" />

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

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

            <meta-data android:name="com.android.settings.title"
@@ -1650,10 +1669,10 @@ 
            android:icon="@drawable/ic_suggestion_fingerprint">

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

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

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

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

            </intent-filter>

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

                       android:value="0,30" />

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

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

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

            <meta-data android:name="com.android.settings.title"
@@ -2786,7 +2805,7 @@ 
            <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="7,11,30" />

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

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

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

            <meta-data android:name="com.android.settings.summary"
@@ -3013,7 +3032,7 @@ 
                       android:resource="@string/system_dashboard_summary"/>

        </activity>



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

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

                  android:label="@string/page_tab_title_support"

                  android:icon="@drawable/ic_help"

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

res/drawable/ic_new_releases_24dp.xml

0 → 100644
+26 −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:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0"

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

    <path android:fillColor="#FF000000"

          android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />

</vector>

res/drawable/ic_suggestion_fingerprint.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="32dp"

        android:height="32dp"

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

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

        android:viewportWidth="32.0"

        android:viewportHeight="32.0">

    <path

res/layout-land/fingerprint_enroll_finish.xml

+0 −10
Original line number Diff line number Diff line
@@ -64,16 +64,6 @@ 
                android:layout_height="wrap_content"

                android:text="@string/security_settings_fingerprint_enroll_finish_message"/>



            <TextView

                android:id="@+id/message_secondary"

                style="@style/SuwDescription.Glif"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/suw_description_glif_margin_top"

                android:text="@string/setup_fingerprint_enroll_finish_message_secondary"

                android:textColor="?android:attr/textColorSecondary"

                android:visibility="gone" />



            <Space

                android:layout_width="0dp"

                android:layout_height="0dp"

res/layout/condition_header_icon.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->



<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/icon"

    android:layout_width="@dimen/dashboard_tile_image_size"

    android:layout_height="@dimen/dashboard_tile_image_size"

    android:layout_marginStart="0dp"

    android:layout_marginEnd="24dp"

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

    android:scaleType="centerInside"/>