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

Add emergency broadcast to app & notification settings.

Browse Source 
Also fixed a bug where progressive disclosure expand button is displayed
incorrectly when # of preference == threshold exactly.

Change-Id: I518687e374853ae8ab1c7e5337822492d6fd99ff
Fix: 36557600
Test: robotests
This commit is contained in:
Fan Zhang
2017-04-28 13:51:08 -07:00
parent 10158feecf
commit d53c6d57f3
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;
}