Merge "Add custom title for settings dialogs" into qt-dev (a7f99efd) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -5801,6 +5801,14 @@ public final class Settings {
		public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION =
		"autofill_field_classification";

		/**
		* Boolean indicating if the dark mode dialog shown on first toggle has been seen.
		*
		* @hide
		*/
		public static final String DARK_MODE_DIALOG_SEEN =
		"dark_mode_dialog_seen";

		/**
		* Defines value returned by {@link android.service.autofill.UserData#getMaxUserDataSize()}.
		*
		@@ -8849,6 +8857,7 @@ public final class Settings {
		SILENCE_NOTIFICATION_GESTURE_COUNT,
		SILENCE_CALL_GESTURE_COUNT,
		SILENCE_TIMER_GESTURE_COUNT,
		DARK_MODE_DIALOG_SEEN
		};

		/**
		@@ -9029,6 +9038,7 @@ public final class Settings {
		VALIDATORS.put(SILENCE_CALL_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(SILENCE_NOTIFICATION_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);
		VALIDATORS.put(ODI_CAPTIONS_ENABLED, ODI_CAPTIONS_ENABLED_VALIDATOR);
		VALIDATORS.put(DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);
		}

		/**

packages/SettingsLib/res/layout/settings_dialog_title.xml

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2019 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:id="@+id/settings_title_panel"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<LinearLayout
		android:id="@+id/settings_title_template"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:gravity="center"
		android:paddingStart="?android:attr/dialogPreferredPadding"
		android:paddingEnd="?android:attr/dialogPreferredPadding"
		android:paddingTop="@*android:dimen/dialog_padding_top_material">

		<ImageView
		android:id="@+id/settings_icon"
		android:layout_width="24dip"
		android:layout_height="24dip"
		android:layout_marginBottom="12dip" />

		<TextView
		android:id="@+id/settings_title"
		android:singleLine="true"
		android:ellipsize="end"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAlignment="center"
		style="?android:attr/windowTitleStyle" />
		</LinearLayout>

		<Space
		android:id="@+id/settings_title_divider"
		android:visibility="gone"
		android:layout_width="match_parent"
		android:layout_height="@*android:dimen/dialog_title_divider_material" />
		</LinearLayout>
		No newline at end of file