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

Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev am: 60a4dc652d

Browse Source 
am: a635c735ea

* commit 'a635c735eaba545ef428ff76d9d4a50303bb4331':
  Add an option allowing to skip wallpaper apps selection.

Change-Id: I8a2bae00cdf82dedacb492c6c0eee3f72251ac33
This commit is contained in:
Sunny Goyal
2016-05-25 23:27:24 +00:00
committed by android-build-merger
parent 14fd2ed541 a635c735ea
commit 9588e9bd50
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SettingsActivity.java
View File

@@ -410,12 +410,7 @@ public class SettingsActivity extends SettingsDrawerActivity
@Override
public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
// Override the fragment title for Wallpaper settings
CharSequence title = pref.getTitle();
if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {
title = getString(R.string.wallpaper_settings_fragment_title);
}
startPreferencePanel(pref.getFragment(), pref.getExtras(), -1, title,
startPreferencePanel(pref.getFragment(), pref.getExtras(), -1, pref.getTitle(),
null, 0);
return true;
}