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

Commit df9b9abd authored by Oleg Blinnikov's avatar Oleg Blinnikov
Browse files

External display page is not searchable 

Page was moved to connnected devices
from connected devices->connection pref.
This makes the page non-searchable,
therefore must be dropped from
the search index.

Change-Id: I437b1310bedc5943041eb0baa73b2e3152eb9ebd
Bug: 294015706
Test: manual
Flag: EXEMPT bugfix
parent c56c2e00

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -1896,8 +1896,6 @@ 
    <!-- Nfc developer settings: The confirm button of the popup dialog. [CHAR_LIMIT=60] -->

    <string name="nfc_reboot_dialog_confirm">Restart</string>









    <!-- External Display settings. The keywords for searching. [CHAR LIMIT=40] -->









    <string name="keywords_external_display">mirror, external display, connected display, usb display, resolution, rotation</string>









    <!-- External Display settings. When external display is enabled. [CHAR LIMIT=40] -->









    <string name="external_display_on">On</string>









    <!-- External Display settings. When external display is disabled. [CHAR LIMIT=40] -->

























res/xml/external_display_settings.xml



+0
−1






























Original line number
Diff line number
Diff line







@@ -17,6 +17,5 @@







<PreferenceScreen









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









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    settings:keywords="@string/keywords_external_display"









    android:title="@string/external_display_settings_title">









</PreferenceScreen>
























src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java



+3
−10






























Original line number
Diff line number
Diff line







@@ -48,9 +48,6 @@ import com.android.settings.SettingsPreferenceFragmentBase;







import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DisplayListener;









import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.Injector;









import com.android.settings.core.SubSettingLauncher;









import com.android.settings.search.BaseSearchIndexProvider;









import com.android.settingslib.search.Indexable;









import com.android.settingslib.search.SearchIndexable;









import com.android.settingslib.widget.FooterPreference;









import com.android.settingslib.widget.IllustrationPreference;









import com.android.settingslib.widget.MainSwitchPreference;








@@ -63,12 +60,8 @@ import java.util.List;







/**









 * The Settings screen for External Displays configuration and connection management.









 */









@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)









public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmentBase









        implements Indexable {









public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmentBase {









    static final int EXTERNAL_DISPLAY_SETTINGS_RESOURCE = R.xml.external_display_settings;









    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =









            new BaseSearchIndexProvider(EXTERNAL_DISPLAY_SETTINGS_RESOURCE);









    static final String DISPLAYS_LIST_PREFERENCE_KEY = "displays_list_preference";









    static final String EXTERNAL_DISPLAY_USE_PREFERENCE_KEY = "external_display_use_preference";









    static final String EXTERNAL_DISPLAY_ROTATION_KEY = "external_display_rotation";








@@ -77,7 +70,7 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen







            R.string.external_display_change_resolution_footer_title;









    static final int EXTERNAL_DISPLAY_LANDSCAPE_DRAWABLE =









            R.drawable.external_display_mirror_landscape;









    static final int EXTERANAL_DISPLAY_TITLE_RESOURCE =









    static final int EXTERNAL_DISPLAY_TITLE_RESOURCE =









            R.string.external_display_settings_title;









    static final int EXTERNAL_DISPLAY_USE_TITLE_RESOURCE =









            R.string.external_display_use_title;








@@ -332,7 +325,7 @@ public class ExternalDisplayPreferenceFragment extends SettingsPreferenceFragmen







                return;









            }









        }









        activity.setTitle(EXTERANAL_DISPLAY_TITLE_RESOURCE);









        activity.setTitle(EXTERNAL_DISPLAY_TITLE_RESOURCE);









    }



















    private void showTextWhenNoDisplaysToShow(@NonNull final PreferenceScreen screen,