Remove DividerPreference and its corresponding usage.
Change-Id: I64ff1b2d6ab77cf40159e6ad157ab2464e7970ed Fixes: 37250410 Test: visual, make RunSettingsRoboTests
This commit is contained in:
@@ -133,11 +133,6 @@
|
|||||||
<attr name="forWork" format="boolean" />
|
<attr name="forWork" format="boolean" />
|
||||||
</declare-styleable>
|
</declare-styleable>
|
||||||
|
|
||||||
<declare-styleable name="DividerPreference">
|
|
||||||
<attr name="allowDividerAbove" format="boolean" />
|
|
||||||
<attr name="allowDividerBelow" format="boolean" />
|
|
||||||
</declare-styleable>
|
|
||||||
|
|
||||||
<declare-styleable name="VideoPreference">
|
<declare-styleable name="VideoPreference">
|
||||||
<attr name="animation" format="reference" />
|
<attr name="animation" format="reference" />
|
||||||
<attr name="preview" format="reference" />
|
<attr name="preview" format="reference" />
|
||||||
|
@@ -28,7 +28,7 @@
|
|||||||
android:key="status_header"
|
android:key="status_header"
|
||||||
android:selectable="false" />
|
android:selectable="false" />
|
||||||
|
|
||||||
<com.android.settings.DividerPreference
|
<Preference
|
||||||
android:key="limit_summary"
|
android:key="limit_summary"
|
||||||
android:selectable="false"
|
android:selectable="false"
|
||||||
settings:allowDividerBelow="true" />
|
settings:allowDividerBelow="true" />
|
||||||
|
@@ -1,65 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.android.settings;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.res.TypedArray;
|
|
||||||
import android.support.v7.preference.Preference;
|
|
||||||
import android.support.v7.preference.PreferenceViewHolder;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public class DividerPreference extends Preference {
|
|
||||||
|
|
||||||
private Boolean mAllowAbove;
|
|
||||||
private Boolean mAllowBelow;
|
|
||||||
|
|
||||||
public DividerPreference(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.DividerPreference, 0, 0);
|
|
||||||
if (a.hasValue(R.styleable.DividerPreference_allowDividerAbove)) {
|
|
||||||
mAllowAbove = a.getBoolean(R.styleable.DividerPreference_allowDividerAbove, false);
|
|
||||||
}
|
|
||||||
if (a.hasValue(R.styleable.DividerPreference_allowDividerBelow)) {
|
|
||||||
mAllowBelow = a.getBoolean(R.styleable.DividerPreference_allowDividerBelow, false);
|
|
||||||
}
|
|
||||||
a.recycle();
|
|
||||||
}
|
|
||||||
|
|
||||||
public DividerPreference(Context context) {
|
|
||||||
this(context, null /* attrs */);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDividerAllowedAbove(boolean allowed) {
|
|
||||||
mAllowAbove = allowed;
|
|
||||||
notifyChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setDividerAllowedBelow(boolean allowed) {
|
|
||||||
mAllowBelow = allowed;
|
|
||||||
notifyChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBindViewHolder(PreferenceViewHolder holder) {
|
|
||||||
super.onBindViewHolder(holder);
|
|
||||||
if (mAllowAbove != null) {
|
|
||||||
holder.setDividerAllowedAbove(mAllowAbove);
|
|
||||||
}
|
|
||||||
if (mAllowBelow != null) {
|
|
||||||
holder.setDividerAllowedBelow(mAllowBelow);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -28,7 +28,6 @@ import android.view.View;
|
|||||||
import com.android.internal.annotations.VisibleForTesting;
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
import com.android.internal.logging.nano.MetricsProto;
|
import com.android.internal.logging.nano.MetricsProto;
|
||||||
import com.android.internal.telephony.SmsUsageMonitor;
|
import com.android.internal.telephony.SmsUsageMonitor;
|
||||||
import com.android.settings.DividerPreference;
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.applications.AppStateBaseBridge.Callback;
|
import com.android.settings.applications.AppStateBaseBridge.Callback;
|
||||||
import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
|
import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
|
||||||
@@ -38,6 +37,7 @@ import com.android.settingslib.applications.ApplicationsState;
|
|||||||
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||||
import com.android.settingslib.applications.ApplicationsState.Callbacks;
|
import com.android.settingslib.applications.ApplicationsState.Callbacks;
|
||||||
import com.android.settingslib.applications.ApplicationsState.Session;
|
import com.android.settingslib.applications.ApplicationsState.Session;
|
||||||
|
import com.android.settingslib.widget.FooterPreference;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
@@ -141,11 +141,9 @@ public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Cal
|
|||||||
screen.addPreference(smsPreference);
|
screen.addPreference(smsPreference);
|
||||||
}
|
}
|
||||||
if (apps.size() != 0) {
|
if (apps.size() != 0) {
|
||||||
DividerPreference summary = new DividerPreference(getPrefContext());
|
FooterPreference footer = new FooterPreference(getPrefContext());
|
||||||
summary.setSelectable(false);
|
footer.setTitle(R.string.premium_sms_warning);
|
||||||
summary.setSummary(R.string.premium_sms_warning);
|
screen.addPreference(footer);
|
||||||
summary.setDividerAllowedAbove(true);
|
|
||||||
screen.addPreference(summary);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!usePreferenceScreenTitle()) {
|
if (!usePreferenceScreenTitle()) {
|
||||||
|
Reference in New Issue
Block a user