Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add custom title for settings dialogs" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 18:16:54 +00:00
committed by Android (Google) Code Review
parent 2dd14519d4 bca4564516
commit f4fc729acd
2 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -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);
}
/**

55
packages/SettingsLib/res/layout/settings_dialog_title.xml Normal file
View File

@@ -0,0 +1,55 @@
<?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>