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

Commit 71958003 authored by Mill Chen's avatar Mill Chen
Browse files

Visual update: update the icons for suggestions 

- remove blue tint
- add the icons of suggestions for contextual homepage

Bug: 122310542
Test: visual, rebuild
Change-Id: I2bac139669a4218455195aebeba83d1649184895
parent 9e9dc49c

AndroidManifest.xml

+5 −5
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ 
        <activity

            android:name=".notification.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_do_not_disturb_on_24dp"

            android:icon="@drawable/ic_suggestion_dnd"

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

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -796,7 +796,7 @@ 


        <activity android:name=".wallpaper.WallpaperSuggestionActivity"

                  android:label="@string/wallpaper_settings_title"

                  android:icon="@drawable/ic_wallpaper"

                  android:icon="@drawable/ic_suggestion_wallpaper"

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

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -889,7 +889,7 @@ 
        <activity

            android:name="Settings$NightDisplaySuggestionActivity"

            android:enabled="@*android:bool/config_nightDisplayAvailable"

            android:icon="@drawable/ic_settings_night_display">

            android:icon="@drawable/ic_suggestion_night_display">

            <intent-filter>

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

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
@@ -1628,7 +1628,7 @@ 
        </activity>



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

            android:icon="@drawable/ic_settings_security">

            android:icon="@drawable/ic_suggestion_security">

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

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

                <category android:name="com.android.settings.suggested.category.DEFAULT" />
@@ -2635,7 +2635,7 @@ 


        <activity android:name=".wifi.calling.WifiCallingSuggestionActivity"

                  android:label="@string/wifi_calling_settings_title"

                  android:icon="@drawable/ic_settings_wireless">

                  android:icon="@drawable/ic_suggestion_wireless">

            <intent-filter>

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

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

res/drawable/ic_suggestion_dnd.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

  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.

  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/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M7,11h10v2h-10z"/>

</vector>

res/drawable/ic_suggestion_night_display.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  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.

  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:tint="?android:attr/colorControlNormal"

        android:viewportHeight="24"

        android:viewportWidth="24">

    <path

        android:fillColor="#FF000000"

        android:pathData="M6.28,4.81c0,0.16 0.01,0.32 0.02,0.48c0.38,6.58 5.83,12.03 12.41,12.41c0.16,0.01 0.32,0.02 0.47,0.02c-1.58,1.2 -3.53,1.88 -5.56,1.88c-0.46,0 -0.93,-0.03 -1.4,-0.1c-3.96,-0.58 -7.13,-3.75 -7.71,-7.71C4.13,9.24 4.8,6.75 6.28,4.81M8.27,0.6c-0.08,0 -0.17,0.02 -0.25,0.07c-3.8,2.2 -6.2,6.56 -5.49,11.4c0.7,4.82 4.59,8.7 9.4,9.4c0.57,0.08 1.13,0.12 1.69,0.12c4.15,0 7.78,-2.26 9.72,-5.62c0.2,-0.35 -0.07,-0.76 -0.44,-0.76c-0.05,0 -0.1,0.01 -0.15,0.02c-1.03,0.31 -2.12,0.48 -3.25,0.48c-0.22,0 -0.44,-0.01 -0.67,-0.02C13.23,15.38 8.62,10.77 8.29,5.17C8.21,3.81 8.38,2.49 8.75,1.26C8.86,0.91 8.59,0.6 8.27,0.6L8.27,0.6z"/>

</vector>

res/drawable/ic_suggestion_security.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

  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.

  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:viewportHeight="24"

        android:viewportWidth="24"

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

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M18.5,1C16.01,1 14,3.01 14,5.5V8H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2h-2V5.5C16,4.12 17.12,3 18.5,3C19.88,3 21,4.12 21,5.5V6h2V5.5C23,3.01 20.99,1 18.5,1zM18,10v10H6V10H18z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_suggestion_wallpaper.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  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.

  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"

        android:viewportHeight="24"

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

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,12.71l2.14,2.58l3,-3.87L18,16.57H6L9,12.71zM5,5h6V3H5C3.9,3 3,3.9 3,5v6h2V5zM19,19h-6v2h6c1.1,0 2,-0.9 2,-2v-6h-2V19zM5,19v-6H3v6c0,1.1 0.9,2 2,2h6v-2H5zM19,5v6h2V5c0,-1.1 -0.9,-2 -2,-2h-6v2H19zM16,9c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1c-0.55,0 -1,0.45 -1,1S15.45,9 16,9z"/>

</vector>