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

Commit d53f90d0 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Remove DND & Notification access screen links. 

These should only be available from 'special access.'

Change-Id: I9e49be9263b3e880031906345422459a5ad23d7f
parent e6be2411

res/menu/zen_settings_menu.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/zen_access"

        android:title="@string/manage_zen_access_title"

        android:showAsAction="never" />

</menu>

res/xml/configure_notification_settings.xml

+0 −13
Original line number Diff line number Diff line
@@ -30,17 +30,4 @@ 
            android:title="@string/lock_screen_notifications_title"

            android:summary="%s" />



    <PreferenceCategory

        android:key="advanced"

        android:title="@string/advanced_section_header" >



        <!-- Notification access -->

        <Preference

                android:key="manage_notification_access"

                android:title="@string/manage_notification_access_title"

                android:persistent="false"

                android:fragment="com.android.settings.notification.NotificationAccessSettings" />



    </PreferenceCategory>



</PreferenceScreen>

src/com/android/settings/notification/ZenModeSettings.java

+0 −17
Original line number Diff line number Diff line
@@ -78,23 +78,6 @@ public class ZenModeSettings extends ZenModeSettingsBase { 
        updateVisualSettingsSummary();

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        inflater.inflate(R.menu.zen_settings_menu, menu);

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        switch (item.getItemId()) {

            case R.id.zen_access:

                ((SettingsActivity) getActivity()).startPreferencePanel(

                            ZenAccessSettings.class.getCanonicalName(), null,

                            R.string.manage_zen_access_title, null, this, 0);

                return true;

        }

        return super.onOptionsItemSelected(item);

    }



    private void updatePrioritySettingsSummary() {

        String s = getResources().getString(R.string.zen_mode_alarms);

        s = appendLowercase(s, isCategoryEnabled(mPolicy, Policy.PRIORITY_CATEGORY_REMINDERS),