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

Commit 81b10fd7 authored by Tom Taylor's avatar Tom Taylor Committed by Android Git Automerger
Browse files

am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 

* commit '1366c756':
  Add new secure setting for controlling Messaging notifications
parents b69ce803 1366c756

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -17365,6 +17365,7 @@ package android.provider { 
    field public static final java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";

    field public static final java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";

    field public static final deprecated java.lang.String LOGGING_ID = "logging_id";

    field public static final java.lang.String MESSAGING_APP_NOTIFICATIONS = "messaging_app_notifications";

    field public static final java.lang.String NETWORK_PREFERENCE = "network_preference";

    field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";

    field public static final java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";

core/java/android/provider/Settings.java

+9 −1
Original line number Diff line number Diff line
@@ -4087,6 +4087,13 @@ public final class Settings { 
        public static final String CONTACTS_PREAUTH_URI_EXPIRATION =

                "contacts_preauth_uri_expiration";



        /**

         * Whether the Messaging app posts notifications.

         * 0=disabled. 1=enabled.

         */

        public static final String MESSAGING_APP_NOTIFICATIONS = "messaging_app_notifications";





        /**

         * This are the settings to be backed up.

         *
@@ -4124,7 +4131,8 @@ public final class Settings { 
            MOUNT_UMS_NOTIFY_ENABLED,

            UI_NIGHT_MODE,

            LOCK_SCREEN_OWNER_INFO,

            LOCK_SCREEN_OWNER_INFO_ENABLED

            LOCK_SCREEN_OWNER_INFO_ENABLED,

            MESSAGING_APP_NOTIFICATIONS

        };



        /**

core/java/android/provider/Telephony.java

+10 −0
Original line number Diff line number Diff line
@@ -1838,5 +1838,15 @@ public final class Telephony { 
        public static final String EXTRA_PLMN       = "plmn";

        public static final String EXTRA_SHOW_SPN   = "showSpn";

        public static final String EXTRA_SPN        = "spn";



        /**

         * Activity Action: Shows a dialog to turn off Messaging app notification.

         * <p>Input: Nothing.

         * <p>Output: Nothing.

         */

        @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

        public static final String ACTION_MESSAGING_APP_NOTIFICATIONS =

            "android.provider.Telephony.MESSAGING_APP_NOTIFICATIONS";



    }

}

packages/SettingsProvider/res/values/defaults.xml

+4 −0
Original line number Diff line number Diff line
@@ -133,4 +133,8 @@ 
    <bool name="def_dtmf_tones_enabled">true</bool>

    <!-- Default for UI touch sounds enabled -->

    <bool name="def_sound_effects_enabled">true</bool>



    <!-- Default for Messaging app notifications enabled -->

    <bool name="def_messaging_app_notifications_on">true</bool>



</resources>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+4 −0
Original line number Diff line number Diff line
@@ -1472,6 +1472,10 @@ public class DatabaseHelper extends SQLiteOpenHelper { 


            loadBooleanSetting(stmt, Settings.Secure.TOUCH_EXPLORATION_ENABLED,

                    R.bool.def_touch_exploration_enabled);



            loadBooleanSetting(stmt, Settings.Secure.MESSAGING_APP_NOTIFICATIONS,

                    R.bool.def_messaging_app_notifications_on);



        } finally {

            if (stmt != null) stmt.close();

        }