From c7c7a813fb39ddb6c10c5268bcf3834c674c7ca7 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Mon, 26 Jul 2021 16:33:31 +0800
Subject: [PATCH] [Provider Model] Correct the Settings shortcut of the
 Settings Widget

The Settings is used the "Internet" settings instead of "Wi-Fi" settings
after Provider Model enabled.

The Settings shortcut of the Settings widget should update below.
  - Remove "Wi-Fi" shortcut from the Settings widget
  - Correct the "Network & internet" shortcut to "Internet"

Bug: 194644851
Test: manual test
  atest -c SettingsUnitTests
  make RunSettingsRoboTests
Change-Id: I488327a01f5e539ecbe315b7016f65084dfd59a1
Merged-In: I488327a01f5e539ecbe315b7016f65084dfd59a1
(cherry picked from commit 658a417205d949dd37370ddaa4a18d9bf4277ed9)
---
 AndroidManifest.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b2cf2412a2..87162822ac9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -273,10 +273,6 @@
                 <action android:name="android.settings.WIFI_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter android:priority="1">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.SHORTCUT" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -285,7 +281,7 @@
 
         <activity
             android:name="Settings$NetworkProviderSettingsActivity"
-            android:label="@string/network_dashboard_title"
+            android:label="@string/provider_internet_settings"
             android:icon="@drawable/ic_homepage_network"
             android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">