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

Merge "Add placeholder on DND settings screen" into pi-dev

Browse Source
This commit is contained in:
Julia Reynolds
2018-03-17 14:28:41 +00:00
committed by Android (Google) Code Review
parent 77d1ca7030 9aac3ce9ed
commit b0f251597c
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/zen_mode_settings.xml
View File

@@ -42,6 +42,11 @@
android:title="@string/zen_mode_automation_settings_title" android:title="@string/zen_mode_automation_settings_title"
android:fragment="com.android.settings.notification.ZenModeAutomationSettings" /> android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
<!-- placeholder -->
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="5" />
<!-- Turn on DND button --> <!-- Turn on DND button -->
<!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory --> <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
<PreferenceCategory <PreferenceCategory

3
src/com/android/settings/dashboard/DashboardFragmentRegistry.java
View File

@@ -31,6 +31,7 @@ import com.android.settings.language.LanguageAndInputSettings;
import com.android.settings.network.NetworkDashboardFragment; import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.notification.ConfigureNotificationSettings; import com.android.settings.notification.ConfigureNotificationSettings;
import com.android.settings.notification.SoundSettings; import com.android.settings.notification.SoundSettings;
import com.android.settings.notification.ZenModeSettings;
import com.android.settings.security.LockscreenDashboardFragment; import com.android.settings.security.LockscreenDashboardFragment;
import com.android.settings.security.SecuritySettings; import com.android.settings.security.SecuritySettings;
import com.android.settings.system.SystemDashboardFragment; import com.android.settings.system.SystemDashboardFragment;
@@ -89,6 +90,8 @@ public class DashboardFragmentRegistry {
CategoryKey.CATEGORY_NOTIFICATIONS); CategoryKey.CATEGORY_NOTIFICATIONS);
PARENT_TO_CATEGORY_KEY_MAP.put(LockscreenDashboardFragment.class.getName(), PARENT_TO_CATEGORY_KEY_MAP.put(LockscreenDashboardFragment.class.getName(),
CategoryKey.CATEGORY_SECURITY_LOCKSCREEN); CategoryKey.CATEGORY_SECURITY_LOCKSCREEN);
PARENT_TO_CATEGORY_KEY_MAP.put(ZenModeSettings.class.getName(),
CategoryKey.CATEGORY_DO_NOT_DISTURB);
CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size()); CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());