SystemUI: Add heads up tile (1/2) (a7e5f923) · Commits · e / os / android_frameworks_base

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
		@@ -101,6 +101,7 @@
		<string name="quick_settings_nfc_label">NFC</string>
		<string name="quick_settings_profiles">System profiles</string>
		<string name="quick_settings_profiles_off">Profiles disabled</string>
		<string name="quick_settings_heads_up_label">Heads up</string>

		<!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_sync_off">Sync off.</string>
		@@ -168,6 +169,16 @@
		<!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
		<string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display turned on.</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>

		<!-- Dynamic tiles -->
		<string name="quick_settings_dynamic_tile_detail_title">Dynamic tile</string>
		<string name="dynamic_qs_tile_next_alarm_label">Next alarm</string>

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

0 → 100644

+107 −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;

		import org.cyanogenmod.internal.logging.CMMetricsLogger;

		/ 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.startActivityDismissingKeyguard(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 int getMetricsCategory() {
		return CMMetricsLogger.TILE_HEADS_UP;
		}

		@Override
		public void setListening(boolean listening) {
		// Do nothing
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import com.android.systemui.qs.tiles.CustomQSTile;
		import com.android.systemui.qs.tiles.DndTile;
		import com.android.systemui.qs.tiles.EditTile;
		import com.android.systemui.qs.tiles.FlashlightTile;
		import com.android.systemui.qs.tiles.HeadsUpTile;
		import com.android.systemui.qs.tiles.HotspotTile;
		import com.android.systemui.qs.tiles.IntentTile;
		import com.android.systemui.qs.tiles.LiveDisplayTile;
		@@ -359,6 +360,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
		else if (tileSpec.equals("lockscreen")) return new LockscreenToggleTile(this);
		else if (tileSpec.equals("ambient_display")) return new AmbientDisplayTile(this);
		else if (tileSpec.equals("live_display")) return new LiveDisplayTile(this);
		else if (tileSpec.equals("heads_up")) return new HeadsUpTile(this);
		else if (tileSpec.startsWith(IntentTile.PREFIX)) return IntentTile.create(this,tileSpec);
		else throw new IllegalArgumentException("Bad tile spec: " + tileSpec);
		}
		@@ -445,6 +447,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
		else if (spec.equals("lockscreen")) return R.string.quick_settings_lockscreen_label;
		else if (spec.equals("ambient_display")) return R.string.quick_settings_ambient_display_label;
		else if (spec.equals("live_display")) return R.string.live_display_title;
		else if (spec.equals("heads_up")) return R.string.quick_settings_heads_up_label;
		return 0;
		}

		@@ -473,6 +476,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
		else if (spec.equals("lockscreen")) return R.drawable.ic_qs_lock_screen_on;
		else if (spec.equals("ambient_display")) return R.drawable.ic_qs_ambientdisplay_on;
		else if (spec.equals("live_display")) return R.drawable.ic_livedisplay_auto;
		else if (spec.equals("heads_up")) return R.drawable.ic_qs_heads_up_on;
		return 0;
		}