Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 347f944a authored by Dan Sandler's avatar Dan Sandler
Browse files

Finally, a place for notification settings.

Consolidated under the new Notifications settings are:

  - Ringtone (from Sound)
  - Zen Mode (from Sound)
  - Pulse LED (from Display)
  - Heads-Up Notifications (from Display)
  - Notification Access (from Security)
  - Show when locked (from Security)

Change-Id: I214d03ba1e356e088323a3058d98d390b8a8f988
parent deb49d0f
Loading
Loading
Loading
Loading
+19 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.ZenModeSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/sound_settings" />
                android:resource="@id/notification_settings" />
        </activity>

        <activity android:name="Settings$DisplaySettingsActivity"
@@ -1708,6 +1708,24 @@
                       android:resource="@id/security_settings" />
        </activity>

        <activity android:name="Settings$NotificationSettingsActivity"
                android:label="@string/notification_settings"
                android:exported="true"
                android:taskAffinity=""
                android:excludeFromRecents="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <action android:name="android.settings.NOTIFICATION_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.android.settings.SHORTCUT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.NotificationSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/notification_settings" />
        </activity>


        <!-- Show regulatory info (from settings item or dialing "*#07#") -->
        <activity android:name="RegulatoryInfoDisplayActivity"
                  android:label="@string/regulatory_information"
+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)

# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
−895 B (412 B)
Loading image diff...
−629 B (338 B)
Loading image diff...
−3.99 KiB (549 B)
Loading image diff...
Loading