PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace to correct footer preference style

Browse Source 
Test: Rebuilt apk and see the result
Fix: 186078568
Change-Id: I24ee2371dd51b8be4aa69d51d08c534117978ff2
This commit is contained in:
Tsung-Mao Fang
2021-04-22 17:04:17 +08:00
parent f71aad11e3
commit a58b144822
5 changed files with 8 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/app_notification_settings.xml
View File

@@ -26,7 +26,7 @@
<com.android.settings.widget.SettingsMainSwitchPreference
android:key="block" />
<com.android.settings.notification.app.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="block_desc" />
@@ -96,11 +96,11 @@
</PreferenceCategory>
<com.android.settings.notification.app.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="desc"
android:order="5000" />
<com.android.settings.notification.app.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="deleted"
android:order="8000" />

4
res/xml/channel_notification_settings.xml
View File

@@ -116,11 +116,11 @@
android:title="@string/app_settings_link"
settings:allowDividerAbove="true"/>
<com.android.settings.notification.app.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="desc"
android:order="100"/>
<com.android.settings.notification.app.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="block_desc"
android:order="110"
settings:allowDividerAbove="false"/>

2
res/xml/conversation_notification_settings.xml
View File

@@ -58,7 +58,7 @@
android:summary="@string/demote_conversation_summary"
settings:allowDividerAbove="true"/>
<com.android.settings.notification.app.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="block_desc"
settings:allowDividerAbove="false"/>

4
res/xml/notification_group_settings.xml
View File

@@ -31,9 +31,9 @@
android:title="@string/app_settings_link"
settings:allowDividerAbove="true"/>
<com.android.settings.notification.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="desc" />
<com.android.settings.notification.NotificationFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="block_desc" />
</PreferenceScreen>

58
src/com/android/settings/notification/app/NotificationFooterPreference.java
View File

@@ -1,58 +0,0 @@
/*
* Copyright (C) 2017 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.
*/
package com.android.settings.notification.app;
import android.content.Context;
import android.text.method.LinkMovementMethod;
import android.util.AttributeSet;
import android.widget.TextView;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.settingslib.R;
/**
* FooterPreference that can have any key or ordering.
*/
public class NotificationFooterPreference extends Preference {
public NotificationFooterPreference(Context context, AttributeSet attrs) {
super(context, attrs, TypedArrayUtils.getAttr(
context, R.attr.footerPreferenceStyle, android.R.attr.preferenceStyle));
init();
}
public NotificationFooterPreference(Context context) {
this(context, null);
}
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
TextView title = holder.itemView.findViewById(android.R.id.title);
title.setMovementMethod(new LinkMovementMethod());
title.setClickable(false);
title.setLongClickable(false);
}
private void init() {
setIcon(R.drawable.ic_info_outline_24dp);
setSelectable(false);
}
}