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

am 3eb0f422: am eff0927d: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev

Browse Source 
* commit '3eb0f422f6e0291a274f72dc3951ce7cf048e5be':
  Once we decide to show Home settings, keep it shown forever
This commit is contained in:
Christopher Tate
2013-10-08 14:26:16 -07:00
committed by Android Git Automerger
parent 83df012357 3eb0f422f6
commit 7e776ad76c
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/HomeSettings.java
View File

@@ -49,7 +49,8 @@ public class HomeSettings extends SettingsPreferenceFragment {
static final int REQUESTING_UNINSTALL = 10; static final int REQUESTING_UNINSTALL = 10;
public static final String CURRENT_HOME = "current_home"; public static final String HOME_PREFS = "home_prefs";
public static final String HOME_PREFS_DO_SHOW = "do_show";
public static final String HOME_SHOW_NOTICE = "show"; public static final String HOME_SHOW_NOTICE = "show";

8
src/com/android/settings/Settings.java
View File

@@ -686,6 +686,12 @@ public class Settings extends PreferenceActivity
} }
private boolean updateHomeSettingHeaders(Header header) { private boolean updateHomeSettingHeaders(Header header) {
// Once we decide to show Home settings, keep showing it forever
SharedPreferences sp = getSharedPreferences(HomeSettings.HOME_PREFS, Context.MODE_PRIVATE);
if (sp.getBoolean(HomeSettings.HOME_PREFS_DO_SHOW, false)) {
return true;
}
try { try {
final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>(); final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
getPackageManager().getHomeActivities(homeApps); getPackageManager().getHomeActivities(homeApps);
@@ -712,6 +718,8 @@ public class Settings extends PreferenceActivity
// Can't look up the home activity; bail on configuring the icon // Can't look up the home activity; bail on configuring the icon
Log.w(LOG_TAG, "Problem looking up home activity!", e); Log.w(LOG_TAG, "Problem looking up home activity!", e);
} }
sp.edit().putBoolean(HomeSettings.HOME_PREFS_DO_SHOW, true).apply();
return true; return true;
} }