PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash when resuming sound setting with AfW on Ryu

Browse Source 
Also renamed a few xmls

Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a
Fix: 36357493
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-03-16 11:08:59 -07:00
parent 52aaa9cc31
commit dc9a82f5b0
8 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/DisplaySettings.java
View File

@@ -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;
}