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

Merge "Add emergency broadcast to app & notification settings." into oc-dev

Browse Source 
am: 908cad27ab

Change-Id: I743b5e63b42e65b8b405417d8e221077a452cc35
This commit is contained in:
Fan Zhang
2017-04-29 06:57:43 +00:00
committed by android-build-merger
parent 586b1e4cee 908cad27ab
commit ae112c8a46
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
View File

@@ -120,7 +120,7 @@ public class ProgressiveDisclosureMixin implements Preference.OnPreferenceClickL
* Whether the screen should be collapsed.
*/
public boolean shouldCollapse(PreferenceScreen screen) {
return !mUserExpanded && screen.getPreferenceCount() >= mTileLimit;
return !mUserExpanded && screen.getPreferenceCount() > mTileLimit;
}
/**
@@ -218,7 +218,7 @@ public class ProgressiveDisclosureMixin implements Preference.OnPreferenceClickL
return pref;
}
if (pref instanceof PreferenceGroup) {
final Preference returnedPreference = ((PreferenceGroup)pref).findPreference(key);
final Preference returnedPreference = ((PreferenceGroup) pref).findPreference(key);
if (returnedPreference != null) {
return returnedPreference;
}