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

Commit fd6a5e3f authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)"... 

Merge "[Settings] Enable support for AdaptiveIcon (Data Usage, Hotspot, VPN)" into tm-dev am: bb44ceb4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286344

Change-Id: Ia862b4241f73dc0e4f8afb39d01277feb3db641d
parents 7d6b56e8 bb44ceb4

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ 
            android:name="Settings$WifiTetherSettingsActivity"

            android:label="@string/wifi_hotspot_checkbox_text"

            android:exported="true"

            android:icon="@drawable/ic_wifi_tethering">

            android:icon="@drawable/ic_homepage_wifi_tethering">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -766,7 +766,7 @@ 
            android:name="Settings$VpnSettingsActivity"

            android:label="@string/vpn_settings_title"

            android:exported="true"

            android:icon="@drawable/ic_settings_wireless">

            android:icon="@drawable/ic_homepage_vpn">

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

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

                <action android:name="android.net.vpn.SETTINGS" />
@@ -2910,7 +2910,7 @@ 
            android:name="Settings$DataUsageSummaryActivity"

            android:label="@string/data_usage_summary_title"

            android:exported="true"

            android:icon="@drawable/ic_settings_data_usage">

            android:icon="@drawable/ic_homepage_data_usage">

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

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

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

res/drawable/ic_homepage_data_usage.xml

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

<!--

  Copyright (C) 2022 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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">



    <item>

        <com.android.settingslib.widget.AdaptiveIconShapeDrawable

            android:width="@dimen/dashboard_tile_image_size"

            android:height="@dimen/dashboard_tile_image_size"

            android:color="@color/homepage_network_background" />

    </item>



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_settings_data_usage" />

</layer-list>

res/drawable/ic_homepage_vpn.xml

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

<!--

  Copyright (C) 2022 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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">



    <item>

        <com.android.settingslib.widget.AdaptiveIconShapeDrawable

            android:width="@dimen/dashboard_tile_image_size"

            android:height="@dimen/dashboard_tile_image_size"

            android:color="@color/homepage_network_background" />

    </item>



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_settings_wireless" />

</layer-list>

res/drawable/ic_homepage_wifi_tethering.xml

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

<!--

  Copyright (C) 2022 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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">



    <item>

        <com.android.settingslib.widget.AdaptiveIconShapeDrawable

            android:width="@dimen/dashboard_tile_image_size"

            android:height="@dimen/dashboard_tile_image_size"

            android:color="@color/homepage_network_background" />

    </item>



    <item

        android:width="@dimen/dashboard_tile_foreground_image_size"

        android:height="@dimen/dashboard_tile_foreground_image_size"

        android:start="@dimen/dashboard_tile_foreground_image_inset"

        android:top="@dimen/dashboard_tile_foreground_image_inset"

        android:drawable="@drawable/ic_wifi_tethering" />

</layer-list>