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

Merge "Consolidate notification settings." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-17 23:16:31 +00:00
committed by Android (Google) Code Review
parent ceedf2b9bf 8cf8bf0ae8
commit 6adf04c741
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -2519,7 +2519,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="com.android.settings.SHORTCUT" /> <category android:name="com.android.settings.SHORTCUT" />
</intent-filter> </intent-filter>
<intent-filter android:priority="120"> <intent-filter android:priority="160">
<action android:name="com.android.settings.action.SETTINGS"/> <action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
@@ -2582,7 +2582,7 @@
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.apps" /> android:value="com.android.settings.category.ia.notifications" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.NotificationApps" /> android:value="com.android.settings.applications.NotificationApps" />
</activity> </activity>

4
res/xml/configure_notification_settings.xml
View File

@@ -18,6 +18,10 @@
android:title="@string/configure_notification_settings" android:title="@string/configure_notification_settings"
android:key="configure_notification_settings"> android:key="configure_notification_settings">
<PreferenceCategory
android:key="dashboard_tile_placeholder"
android:order="1"/>
<!-- Pulse notification light --> <!-- Pulse notification light -->
<SwitchPreference <SwitchPreference
android:key="notification_pulse" android:key="notification_pulse"

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

@@ -30,6 +30,7 @@ import com.android.settings.deviceinfo.StorageDashboardFragment;
import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.language.LanguageAndInputSettings; 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.SoundSettings; import com.android.settings.notification.SoundSettings;
import com.android.settings.system.SystemDashboardFragment; import com.android.settings.system.SystemDashboardFragment;
import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.CategoryKey;
@@ -83,6 +84,8 @@ public class DashboardFragmentRegistry {
CategoryKey.CATEGORY_SYSTEM_LANGUAGE); CategoryKey.CATEGORY_SYSTEM_LANGUAGE);
PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(), PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(),
CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT); CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);
PARENT_TO_CATEGORY_KEY_MAP.put(ConfigureNotificationSettings.class.getName(),
CategoryKey.CATEGORY_NOTIFICATIONS);
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());