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

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

Merge "Fix double search icon in wifi calling page"

parents 9cc998d5 b91db421

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -2893,12 +2893,12 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.WifiCallingSettings" />

                       android:value="com.android.settings.wifi.calling.WifiCallingSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



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

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

                  android:label="@string/wifi_calling_settings_title"

                  android:icon="@drawable/ic_settings_wireless">

            <intent-filter>
@@ -2906,7 +2906,7 @@ 
                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.WifiCallingSettings" />

                       android:value="com.android.settings.wifi.calling.WifiCallingSettings" />

            <meta-data android:name="com.android.settings.dismiss"

                android:value="10,14,30" />

            <meta-data android:name="com.android.settings.title"

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -6478,6 +6478,7 @@ 
    <string name="help_uri_process_stats_apps" translatable="false"></string>

    <string name="help_uri_private_dns" translatable="false"></string>

    <string name="help_uri_about_phone_v2" translatable="false"></string>

    <string name="help_uri_wifi_calling" translatable="false"></string>









    <!-- User account title [CHAR LIMIT=30] -->









    <string name="user_account_title">Account for content</string>

























src/com/android/settings/core/gateway/SettingsGateway.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -28,7 +28,7 @@ import com.android.settings.Settings;







import com.android.settings.TestingSettings;









import com.android.settings.TetherSettings;









import com.android.settings.TrustedCredentialsSettings;









import com.android.settings.WifiCallingSettings;









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









import com.android.settings.accessibility.AccessibilitySettings;









import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;









import com.android.settings.accessibility.CaptionPropertiesFragment;
































src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -37,7 +37,7 @@ import com.android.settings.overlay.FeatureFactory;







import com.android.settings.password.ScreenLockSuggestionActivity;









import com.android.settings.support.NewDeviceIntroSuggestionActivity;









import com.android.settings.wallpaper.WallpaperSuggestionActivity;









import com.android.settings.wifi.WifiCallingSuggestionActivity;









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









import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;









import com.android.settingslib.drawer.Tile;









import com.android.settingslib.suggestions.SuggestionControllerMixin;
































src/com/android/settings/search/actionbar/SearchMenuController.java



+5
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,7 @@ import com.android.settings.R;







import com.android.settings.overlay.FeatureFactory;









import com.android.settings.search.SearchFeatureProvider;









import com.android.settingslib.core.lifecycle.LifecycleObserver;









import com.android.settingslib.core.lifecycle.ObservableFragment;









import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;









import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;


















@@ -41,6 +42,10 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM







        host.getLifecycle().addObserver(new SearchMenuController(host));









    }



















    public static void init(@NonNull ObservableFragment host) {









        host.getLifecycle().addObserver(new SearchMenuController(host));









    }



















    private SearchMenuController(@NonNull Fragment host) {









        mHost = host;









    }