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

Commit 908c7dcf authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Restore do-not-disturb mode on tablets." into jb-dev

parents 20cfb606 d2217f0c

packages/SystemUI/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -369,4 +369,12 @@ 
    <!-- Title shown in notification popup for inspecting the responsible

         application -->

    <string name="status_bar_notification_inspect_item_title">App info</string>



    <!-- Title for the pseudo-notification shown when notifications are disabled (do-not-disturb

         mode) -->

    <string name="notifications_off_title">Notifications off</string>



    <!-- Content text for do-not-disturb mode notification -->

    <string name="notifications_off_text">Tap here to turn notifications back on.</string>



</resources>

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import com.android.systemui.R; 
import com.android.systemui.recent.RecentTasksLoader;

import com.android.systemui.recent.RecentsPanelView;

import com.android.systemui.statusbar.BaseStatusBar;

import com.android.systemui.statusbar.DoNotDisturb;

import com.android.systemui.statusbar.NotificationData;

import com.android.systemui.statusbar.SignalClusterView;

import com.android.systemui.statusbar.StatusBarIconView;
@@ -165,6 +166,7 @@ public class TabletStatusBar extends BaseStatusBar implements 
    BluetoothController mBluetoothController;

    LocationController mLocationController;

    NetworkController mNetworkController;

    DoNotDisturb mDoNotDisturb;



    ViewGroup mBarContents;
@@ -520,6 +522,9 @@ public class TabletStatusBar extends BaseStatusBar implements 
        // The icons

        mLocationController = new LocationController(mContext); // will post a notification



        // watch the PREF_DO_NOT_DISTURB and convert to appropriate disable() calls

        mDoNotDisturb = new DoNotDisturb(mContext);



        mBatteryController = new BatteryController(mContext);

        mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));

        mBluetoothController = new BluetoothController(mContext);