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

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

Browse Source
This commit is contained in:
Fan Zhang
2017-03-16 20:13:35 +00:00
committed by Android (Google) Code Review
parent 3ad2b442b0 dc9a82f5b0
commit 4eb22906bb
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;
}

4
src/com/android/settings/notification/SoundSettings.java
View File

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

2
src/com/android/settings/notification/WorkSoundPreferenceController.java
View File

@@ -222,7 +222,7 @@ public class WorkSoundPreferenceController extends PreferenceController implemen
KEY_WORK_ALARM_RINGTONE);
}
if (!mVoiceCapable) {
mWorkPreferenceCategory.removePreference(mWorkPhoneRingtonePreference);
mWorkPhoneRingtonePreference.setVisible(false);
mWorkPhoneRingtonePreference = null;
}