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

Commit 34c4deb6 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up Contextual Wifi card 

Bug: 245854887
Test: m RunSettingsRoboTests
Change-Id: I3b4ccc076a68eadc11e9fb3d2967a34fe0396cf9
parent b76f32ef

res/drawable/ic_wifi_off.xml

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

  ~ Copyright (C) 2020 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="@android:color/white"

        android:pathData="M23,9c-4.11,-4.11 -9.93,-5.43 -15.15,-3.98l9.57,9.57L23,9zM5.76,5.76L2.81,2.81 1.39,4.22l2.52,2.52C2.88,7.37 1.89,8.11 1,9l11,11 2.59,-2.59 5.19,5.19 1.41,-1.41L16,16 5.76,5.76z"/>

</vector>
 
 No newline at end of file

res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -2167,12 +2167,8 @@ 








    <!-- Button label to connect to a Wi-Fi network -->









    <string name="wifi_connect">Connect</string>









    <!-- Turned on notification for Wi-Fi [CHAR LIMIT=40] -->









    <string name="wifi_turned_on_message">Wi\u2011Fi turned on</string>









    <!-- A notification for connected to a Wi-Fi network [CHAR LIMIT=NONE] -->









    <string name="wifi_connected_to_message">Connected to <xliff:g id="network_name" example="MyNetwork">%1$s</xliff:g></string>









    <!-- A notification for connecting to a Wi-Fi network [CHAR LIMIT=NONE] -->









    <string name="wifi_connecting_to_message">Connecting to <xliff:g id="network_name" example="MyNetwork">%1$s</xliff:g></string>









    <!-- Button label to connecting progress to a Wi-Fi network [CHAR LIMIT=20] -->









    <string name="wifi_connecting">Connecting\u2026</string>









    <!-- Failured notification for connect -->
































src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java



+1
−3






























Original line number
Diff line number
Diff line







@@ -18,7 +18,6 @@ package com.android.settings.homepage.contextualcards;

















import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.STICKY_VALUE;









import static com.android.settings.slices.CustomSliceRegistry.BLUETOOTH_DEVICES_SLICE_URI;









import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI;



















import android.app.settings.SettingsEnums;









import android.content.Context;








@@ -225,8 +224,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>







    }



















    private boolean isLargeCard(ContextualCard card) {









        return card.getSliceUri().equals(CONTEXTUAL_WIFI_SLICE_URI)









                || card.getSliceUri().equals(BLUETOOTH_DEVICES_SLICE_URI);









        return card.getSliceUri().equals(BLUETOOTH_DEVICES_SLICE_URI);









    }



















    public interface CardContentLoaderListener {
































src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java



+0
−7






























Original line number
Diff line number
Diff line







@@ -32,12 +32,6 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {







    @Override









    @Nullable









    public ContextualCardList getContextualCards() {









        final ContextualCard wifiCard =









                ContextualCard.newBuilder()









                        .setSliceUri(CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI.toString())









                        .setCardName(CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI.toString())









                        .setCardCategory(ContextualCard.Category.IMPORTANT)









                        .build();









        final ContextualCard connectedDeviceCard =









                ContextualCard.newBuilder()









                        .setSliceUri(CustomSliceRegistry.BLUETOOTH_DEVICES_SLICE_URI.toString())








@@ -71,7 +65,6 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {







                        .setCardCategory(ContextualCard.Category.IMPORTANT)









                        .build();









        final ContextualCardList cards = ContextualCardList.newBuilder()









                .addCard(wifiCard)









                .addCard(connectedDeviceCard)









                .addCard(lowStorageCard)









                .addCard(contextualAdaptiveSleepCard)
































src/com/android/settings/slices/CustomSliceRegistry.java



+0
−11






























Original line number
Diff line number
Diff line







@@ -41,7 +41,6 @@ import com.android.settings.network.ProviderModelSlice;







import com.android.settings.network.telephony.MobileDataSlice;









import com.android.settings.notification.zen.ZenModeButtonPreferenceController;









import com.android.settings.wifi.calling.WifiCallingSliceHelper;









import com.android.settings.wifi.slice.ContextualWifiSlice;









import com.android.settings.wifi.slice.WifiSlice;









import com.android.settingslib.media.MediaOutputConstants;


















@@ -82,15 +81,6 @@ public class CustomSliceRegistry {







            .appendPath("bluetooth_devices")









            .build();



















    /**









     * Backing Uri for the Wifi Slice.









     */









    public static final Uri CONTEXTUAL_WIFI_SLICE_URI = new Uri.Builder()









            .scheme(ContentResolver.SCHEME_CONTENT)









            .authority(SettingsSlicesContract.AUTHORITY)









            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)









            .appendPath("contextual_wifi")









            .build();









    /**









     * Slice Uri for Enhanced 4G slice









     */








@@ -321,7 +311,6 @@ public class CustomSliceRegistry {







        // Slices for contextual card.









        sUriToSlice.put(FACE_ENROLL_SLICE_URI, FaceSetupSlice.class);









        sUriToSlice.put(CONTEXTUAL_ADAPTIVE_SLEEP_URI, ContextualAdaptiveSleepSlice.class);









        sUriToSlice.put(CONTEXTUAL_WIFI_SLICE_URI, ContextualWifiSlice.class);









        sUriToSlice.put(LOW_STORAGE_SLICE_URI, LowStorageSlice.class);









        sUriToSlice.put(BLUETOOTH_DEVICES_SLICE_URI, BluetoothDevicesSlice.class);









    }