Merge "Add conversations image resource" into rvc-dev (a3160941) · Commits · e / os / android_packages_apps_Settings

res/layout/zen_mode_senders_overlay_image.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 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.
		-->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/zen_mode_settings_senders_overlay_view"
		android:layout_centerInParent="true"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		</RelativeLayout>
		</RelativeLayout>

+1 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@
		<dimen name="zen_mode_button_padding_vertical">16dp</dimen>
		<dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>
		<dimen name="zen_schedule_day_margin">17dp</dimen>
		<dimen name="zen_conversations_icon_size">56dp</dimen>

		<dimen name="rect_button_radius">8dp</dimen>

+2 −0

Original line number	Diff line number	Diff line
		@@ -7809,6 +7809,8 @@

		<!-- Do not disturb: restrict notifications settings title [CHAR LIMIT=80] -->
		<string name="zen_mode_restrict_notifications_title">Display options for hidden notifications</string>
		<!-- Do not disturb: Hide notifications screen category title [CHAR LIMIT=100] -->
		<string name="zen_mode_restrict_notifications_category">When Do Not Disturb is on</string>
		<!-- Do not disturb: Mute notifications option [CHAR LIMIT=60] -->
		<string name="zen_mode_restrict_notifications_mute">No sound from notifications</string>
		<!-- Do not disturb:Mute notifications summary [CHAR LIMIT=NONE] -->

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,8 @@
		<!-- Senders image -->
		<com.android.settingslib.widget.LayoutPreference
		android:key="zen_mode_calls_image"
		android:layout="@layout/zen_mode_senders_image" />
		android:layout="@layout/zen_mode_senders_image"
		android:selectable="false"/>
		</PreferenceCategory>

		<!-- Repeat callers -->

+6 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@
		<PreferenceCategory
		android:key="zen_mode_conversations_radio_buttons"
		android:title="@string/zen_mode_conversations_section_title">
		<!-- TODO: add preference with chat images here (b/151845457) -->

		<!-- Senders image -->
		<com.android.settingslib.widget.LayoutPreference
		android:key="zen_mode_conversations_image"
		android:layout="@layout/zen_mode_senders_overlay_image"
		android:selectable="false"/>
		</PreferenceCategory>
		</PreferenceScreen>
		No newline at end of file