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

Commit 5acc23d4 authored by Michael Bestas's avatar Michael Bestas Committed by Gerrit Code Review
Browse files

QS: Add heads up tile (1/2) 

Change-Id: I0e3cff73752c59d804dcec43b86524c2e8df4f57
parent fa0b6b28

core/java/com/android/internal/util/cm/QSConstants.java

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public class QSConstants { 
    public static final String TILE_SCREEN_TIMEOUT = "screen_timeout";

    public static final String TILE_LIVE_DISPLAY = "live_display";

    public static final String TILE_USB_TETHER = "usb_tether";

    public static final String TILE_HEADS_UP = "heads_up";



    // Order matters

    protected static final ArrayList<String> TILES_DEFAULT = new ArrayList<String>();
@@ -84,5 +85,6 @@ public class QSConstants { 
        TILES_AVAILABLE.add(TILE_SCREEN_TIMEOUT);

        TILES_AVAILABLE.add(TILE_LIVE_DISPLAY);

        TILES_AVAILABLE.add(TILE_USB_TETHER);

        TILES_AVAILABLE.add(TILE_HEADS_UP);

    }

}

packages/SystemUI/res/drawable/ic_qs_heads_up_off.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2014 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.

-->

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

        android:width="64dp"

        android:height="64dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,10.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7C9.5,4.3 9.0,4.5 8.6,4.7l9.4,9.4L18.0,10.5zM17.7,19.0l2.0,2.0l1.3,-1.3L4.3,3.0L3.0,4.3l2.9,2.9C5.3,8.2 5.0,9.3 5.0,10.5L5.0,16.0l-2.0,2.0l0.0,1.0L17.7,19.0z" />

</vector>

packages/SystemUI/res/drawable/ic_qs_heads_up_on.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2014 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.

-->

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

        android:width="64dp"

        android:height="64dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>

</vector>

packages/SystemUI/res/values/cm_strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ 
    <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_location_high_accuracy">Location reporting: high accuracy mode.</string>



    <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_heads_up_off">Heads up off.</string>

    <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_heads_up_on">Heads up on.</string>



    <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_heads_up_changed_off">Heads up turned off.</string>

    <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_heads_up_changed_on">Heads up turned on.</string>



    <string name="accessibility_dpad_left">Cursor left</string>

    <string name="accessibility_dpad_right">Cursor right</string>
@@ -81,6 +91,7 @@ 
    <string name="quick_settings_visualizer_label" translatable="false">AudioFX</string>

    <string name="quick_settings_screen_timeout_detail_title">Screen timeout</string>

    <string name="quick_settings_usb_tether_label">USB tethering</string>

    <string name="quick_settings_heads_up_label">Heads up</string>



    <!-- Weather string format in expanded statusbar header -->

    <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>

packages/SystemUI/src/com/android/systemui/qs/tiles/HeadsUpTile.java

0 → 100644
+99 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The CyanogenMod 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.

 */



package com.android.systemui.qs.tiles;



import android.content.Context;

import android.content.Intent;

import android.provider.Settings;

import android.provider.Settings.Global;



import com.android.systemui.qs.GlobalSetting;

import com.android.systemui.qs.QSTile;

import com.android.systemui.R;



/** Quick settings tile: Heads up **/

public class HeadsUpTile extends QSTile<QSTile.BooleanState> {



    private static final Intent NOTIFICATION_SETTINGS = new Intent("android.settings.NOTIFICATION_MANAGER");



    private final GlobalSetting mSetting;



    public HeadsUpTile(Host host) {

        super(host);



        mSetting = new GlobalSetting(mContext, mHandler, Global.HEADS_UP_NOTIFICATIONS_ENABLED) {

            @Override

            protected void handleValueChanged(int value) {

                handleRefreshState(value);

            }

        };

    }



    @Override

    protected BooleanState newTileState() {

        return new BooleanState();

    }



    @Override

    protected void handleClick() {

        setEnabled(!mState.value);

        refreshState();

    }



    @Override

    protected void handleLongClick() {

        mHost.startSettingsActivity(NOTIFICATION_SETTINGS);

    }



    private void setEnabled(boolean enabled) {

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,

                enabled ? 1 : 0);

    }



    @Override

    protected void handleUpdateState(BooleanState state, Object arg) {

        final int value = arg instanceof Integer ? (Integer)arg : mSetting.getValue();

        final boolean headsUp = value != 0;

        state.value = headsUp;

        state.visible = true;

        state.label = mContext.getString(R.string.quick_settings_heads_up_label);

        if (headsUp) {

            state.icon = ResourceIcon.get(R.drawable.ic_qs_heads_up_on);

            state.contentDescription =  mContext.getString(

                    R.string.accessibility_quick_settings_heads_up_on);

        } else {

            state.icon = ResourceIcon.get(R.drawable.ic_qs_heads_up_off);

            state.contentDescription =  mContext.getString(

                    R.string.accessibility_quick_settings_heads_up_off);

        }

    }



    @Override

    protected String composeChangeAnnouncement() {

        if (mState.value) {

            return mContext.getString(R.string.accessibility_quick_settings_heads_up_changed_on);

        } else {

            return mContext.getString(R.string.accessibility_quick_settings_heads_up_changed_off);

        }

    }



    @Override

    public void setListening(boolean listening) {

        // Do nothing

    }

}