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

Commit e5150a18 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert color-coded icons."

parents 68ef61a1 7bf67713

AndroidManifest.xml

+7 −7
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ 
        <activity android:name=".Settings$NetworkDashboardActivity"

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

            android:taskAffinity="com.android.settings"

            android:taskAffinity="com.android.settings"

            android:label="@string/network_dashboard_title"

            android:label="@string/network_dashboard_title"

            android:icon="@drawable/ic_dashboard_network"

            android:icon="@drawable/ic_settings_wireless"

            android:parentActivityName="Settings">

            android:parentActivityName="Settings">

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

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

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

                <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -916,7 +916,7 @@ 




        <activity android:name="Settings$DisplaySettingsActivity"

        <activity android:name="Settings$DisplaySettingsActivity"

                android:label="@string/display_settings"

                android:label="@string/display_settings"

                android:icon="@drawable/ic_dashboard_display"

                android:icon="@drawable/ic_settings_display"

                android:taskAffinity="">

                android:taskAffinity="">

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

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

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

                <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -1298,7 +1298,7 @@ 




        <activity android:name="Settings$SecuritySettingsActivity"

        <activity android:name="Settings$SecuritySettingsActivity"

                android:label="@string/security_settings_title"

                android:label="@string/security_settings_title"

                android:icon="@drawable/ic_dashboard_security"

                android:icon="@drawable/ic_settings_security"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:taskAffinity=""

                android:taskAffinity=""

                android:parentActivityName="Settings">

                android:parentActivityName="Settings">
@@ -2989,7 +2989,7 @@ 
        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->

        <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->

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

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

                  android:label="@string/app_and_notification_dashboard_title"

                  android:label="@string/app_and_notification_dashboard_title"

                  android:icon="@drawable/ic_dashboard_apps">

                  android:icon="@drawable/ic_apps">

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

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

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

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

            </intent-filter>

            </intent-filter>
@@ -3003,7 +3003,7 @@ 




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

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

                  android:label="@string/storage_settings"

                  android:label="@string/storage_settings"

                  android:icon="@drawable/ic_dashboard_storage">

                  android:icon="@drawable/ic_settings_storage">

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

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

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

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

            </intent-filter>

            </intent-filter>
@@ -3017,7 +3017,7 @@ 




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

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

                  android:label="@string/account_dashboard_title"

                  android:label="@string/account_dashboard_title"

                  android:icon="@drawable/ic_dashboard_user">

                  android:icon="@drawable/ic_settings_accounts">

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

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

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

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

            </intent-filter>

            </intent-filter>
@@ -3035,7 +3035,7 @@ 




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

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

                  android:label="@string/header_category_system"

                  android:label="@string/header_category_system"

                  android:icon="@drawable/ic_dashboard_system">

                  android:icon="@drawable/ic_settings_about">

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

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

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

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

            </intent-filter>

            </intent-filter>

res/drawable/ic_dashboard_apps.xml

deleted100644 → 0
+0 −25
Original line number Original line 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.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"

        android:fillColor="#ec8122"/>

</vector>

res/drawable/ic_dashboard_display.xml

deleted100644 → 0
+0 −26
Original line number Original line 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.

  -->



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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#4184f3"

        android:pathData="M20.0,15.31L23.31,12.0 20.0,8.69L20.0,4.0l-4.69,0.0L12.0,0.69 8.69,4.0L4.0,4.0l0.0,4.69L0.69,12.0 4.0,15.31L4.0,20.0l4.69,0.0L12.0,23.31 15.31,20.0L20.0,20.0l0.0,-4.69zM12.0,18.0L12.0,6.0c3.31,0.0 6.0,2.69 6.0,6.0s-2.69,6.0 -6.0,6.0z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_dashboard_network.xml

deleted100644 → 0
+0 −26
Original line number Original line 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.

  -->



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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="18.0"

        android:viewportHeight="18.0">

    <path

        android:fillColor="#0b9c57"

        android:pathData="M9.01,15.99l8.8,-10.96C17.47,4.77 14.08,2.0 9.0,2.0S0.53,4.7 0.19,5.03l8.8,10.96l0.02,0.0z"/>

</vector>

res/drawable/ic_dashboard_security.xml

deleted100644 → 0
+0 −26
Original line number Original line 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.

  -->



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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#7a1ea1"

        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>

</vector>
 
 No newline at end of file