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 am: 908cad27ab

Browse Source 
am: ae112c8a46

Change-Id: I879f97321c9a3af20a1c8ec2de49c8fcf4bedbe9
This commit is contained in:
Fan Zhang
2017-04-29 06:59:44 +00:00
committed by android-build-merger
parent bf4b1b0261 ae112c8a46
commit 5801c66ad7
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/xml/app_and_notification.xml
View File

@@ -25,17 +25,28 @@
android:title="@string/app_permissions"
android:order="-130"
settings:keywords="@string/keywords_app_permissions">
<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
<intent android:action="android.intent.action.MANAGE_PERMISSIONS" />
</Preference>
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="10"/>
android:order="10" />
<com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings"
android:title="@string/cell_broadcast_settings"
android:order="15"
settings:useAdminDisabledSummary="true">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.cellbroadcastreceiver"
android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
</com.android.settingslib.RestrictedPreference>
<Preference
android:key="special_access"
android:fragment="com.android.settings.applications.SpecialAccessSettings"
android:title="@string/special_access"
android:order="20"/>
android:order="20" />
</PreferenceScreen>

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

9
tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
View File

@@ -92,6 +92,15 @@ public class ProgressiveDisclosureTest {
assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
}
@Test
public void shouldNotCollapse_preferenceCountSameAsThreshold() {
when(mScreen.getPreferenceCount()).thenReturn(5);
mMixin.setTileLimit(5);
assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
}
@Test
public void shouldNotCollapse_whenStartAsExpanded() {
when(mScreen.getPreferenceCount()).thenReturn(5);