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

Commit 4eb22906 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix a crash when resuming sound setting with AfW on Ryu"

parents 3ad2b442 dc9a82f5

src/com/android/settings/DisplaySettings.java

+2 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.settings.display.ThemePreferenceController; 
import com.android.settings.display.TimeoutPreferenceController;

import com.android.settings.display.VrDisplayPreferenceController;

import com.android.settings.display.WallpaperPreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;
@@ -64,7 +63,7 @@ public class DisplaySettings extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.ia_display_settings;

        return R.xml.display_settings;

    }



    @Override
@@ -104,7 +103,7 @@ public class DisplaySettings extends DashboardFragment { 
                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();



                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.ia_display_settings;

                    sir.xmlResId = R.xml.display_settings;

                    result.add(sir);

                    return result;

                }

src/com/android/settings/notification/SoundSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class SoundSettings extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.ia_sound_settings;

        return R.xml.sound_settings;

    }



    @Override
@@ -216,7 +216,7 @@ public class SoundSettings extends DashboardFragment { 
                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.ia_sound_settings;

                    sir.xmlResId = R.xml.sound_settings;

                    return Arrays.asList(sir);

                }

src/com/android/settings/notification/WorkSoundPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class WorkSoundPreferenceController extends PreferenceController implemen 
                    KEY_WORK_ALARM_RINGTONE);

        }

        if (!mVoiceCapable) {

            mWorkPreferenceCategory.removePreference(mWorkPhoneRingtonePreference);

            mWorkPhoneRingtonePreference.setVisible(false);

            mWorkPhoneRingtonePreference = null;

        }