Merge "Notification slider update." into nyc-dev (9e8bc7c6) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/drawable/notification_auto_importance.xml

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2016 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="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M11.2,13.6l1.6,0l-0.8,-2.6z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M22.5,9.6L15,9l-3,-7L9,9L1.5,9.6l5.7,5L5.5,22l6.5,-3.9l6.5,3.9l-1.7,-7.4L22.5,9.6zM13.6,16l-0.5,-1.4h-2.3L10.4,16H9l2.3,-6.4h1.4L15,16H13.6z"/>
		</vector>
		No newline at end of file

packages/SystemUI/res/layout/notification_guts.xml

+8 −16

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="14dp"
		android:paddingTop="15dp"
		android:paddingEnd="8dp"
		android:id="@+id/notification_guts_header"
		android:orientation="horizontal"
		@@ -99,6 +99,7 @@
		android:clickable="false"
		android:focusable="false"
		android:paddingEnd="8dp"
		android:paddingTop="4dp"
		android:visibility="gone">
		<TextView
		android:id="@+id/title"
		@@ -123,21 +124,20 @@

		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:layout_height="wrap_content"
		android:paddingTop="8dp" >

		<ImageView
		android:id="@+id/low_importance"
		android:src="@*android:drawable/ic_notification_block"
		android:id="@+id/auto_importance"
		android:src="@drawable/notification_auto_importance"
		android:layout_gravity="center_vertical\|start"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:tint="@color/notification_guts_icon_tint"/>
		android:layout_width="48dp"
		android:layout_height="48dp" />

		<SeekBar
		android:id="@+id/seekbar"
		android:layout_marginStart="56dp"
		android:layout_marginEnd="56dp"
		android:layout_marginEnd="32dp"
		android:layout_gravity="center_vertical"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		@@ -149,14 +149,6 @@
		style="@android:style/Widget.Material.SeekBar.Discrete"
		android:tickMarkTint="@android:color/black" />

		<ImageView
		android:id="@+id/max_importance"
		android:src="@*android:drawable/ic_notification_alert"
		android:layout_gravity="center_vertical\|end"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:tint="@color/notification_guts_icon_tint" />

		</FrameLayout>
		</LinearLayout>
		<!-- buttons -->

packages/SystemUI/res/layout/power_notification_controls_settings.xml

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2016 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.
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<include layout="@layout/switch_bar" />

		<TextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="16dp"
		android:text="@string/power_notification_controls_description"/>

		</LinearLayout>

packages/SystemUI/res/values/colors.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,7 @@
		<!-- The "inside" of a notification, reached via longpress -->
		<color name="notification_guts_bg_color">#eeeeee</color>
		<color name="notification_guts_slider_color">@*android:color/material_deep_teal_500</color>
		<color name="notification_guts_disabled_slider_color">@*android:color/material_grey_300</color>
		<color name="notification_guts_secondary_slider_color">#858383</color>
		<color name="notification_guts_icon_tint">#8a000000</color>
		<color name="notification_guts_disabled_icon_tint">#4d000000</color>

packages/SystemUI/res/values/strings.xml

+44 −13

Original line number	Diff line number	Diff line
		@@ -1225,38 +1225,69 @@
		<string name="do_not_silence_block">Don\'t silence or block</string>

		<!-- [CHAR LIMIT=NONE] Importance Tuner setting title -->
		<string name="tuner_full_importance_settings">Show full importance settings</string>
		<string name="tuner_full_importance_settings">Power notification controls</string>
		<string name="tuner_full_importance_settings_on">On</string>
		<string name="tuner_full_importance_settings_off">Off</string>
		<string name="power_notification_controls_description">With power notification controls, you can set an importance level from 0 to 5 for an app\'s notifications.
		\n\n<b>Level 5</b>
		\n- Show at the top of the notification list
		\n- Allow full screen interruption
		\n- Always peek
		\n\n<b>Level 4</b>
		\n- Prevent full screen interruption
		\n- Always peek
		\n\n<b>Level 3</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n\n<b>Level 2</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n- Never make sound and vibration
		\n\n<b>Level 1</b>
		\n- Prevent full screen interruption
		\n- Never peek
		\n- Never make sound or vibrate
		\n- Hide from lock screen and status bar
		\n- Show at the bottom of the notification list
		\n\n<b>Level 0</b>
		\n- Block all notifications from the app
		</string>

		<!-- Notification importance title, user unspecified status-->
		<string name="user_unspecified_importance">Importance: Automatic</string>
		<!-- Notification importance title, blocked status-->
		<string name="blocked_importance">Blocked</string>
		<string name="blocked_importance">Importance: Level 0</string>
		<!-- Notification importance title, min status-->
		<string name="min_importance">Min importance</string>
		<string name="min_importance">Importance: Level 1</string>
		<!-- Notification importance title, low status-->
		<string name="low_importance">Low importance</string>
		<string name="low_importance">Importance: Level 2</string>
		<!-- Notification importance title, normal status-->
		<string name="default_importance">Normal importance</string>
		<string name="default_importance">Importance: Level 3</string>
		<!-- Notification importance title, high status-->
		<string name="high_importance">High importance</string>
		<string name="high_importance">Importance: Level 4</string>
		<!-- Notification importance title, max status-->
		<string name="max_importance">Urgent importance</string>
		<string name="max_importance">Importance: Level 5</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
		<string name="notification_importance_user_unspecified">App determines importance for each notification.</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description -->
		<string name="notification_importance_blocked">Never show these notifications</string>
		<string name="notification_importance_blocked">Never show notifications from this app.</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: min importance level description -->
		<string name="notification_importance_min">Silently show at the bottom of the notification list</string>
		<string name="notification_importance_min">No full screen interruption, peeking, sound, or vibration. Hide from lock screen and status bar.</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: low importance level description -->
		<string name="notification_importance_low">Silently show these notifications</string>
		<string name="notification_importance_low">No full screen interruption, peeking, sound, or vibration.</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: normal importance level description -->
		<string name="notification_importance_default">Allow these notification to make sounds</string>
		<string name="notification_importance_default">No full screen interruption or peeking.</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: high importance level description -->
		<string name="notification_importance_high">Peek onto the screen and allow sound and allow sound</string>
		<string name="notification_importance_high">Always peek. No full screen interruption.</string>

		<!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description -->
		<string name="notification_importance_max">Show at the top of the notifications list, peek onto the screen and allow sound</string>
		<string name="notification_importance_max">Always peek, and allow full screen interruption.</string>

		<!-- Notification: Control panel: Label for button that launches notification settings. [CHAR LIMIT=NONE] -->
		<string name="notification_more_settings">More settings</string>