Merge "fix build for ag/887244" into nyc-dev
diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml
index 0ed914a..5d83590 100644
--- a/res/xml/accessibility_settings_for_setup_wizard.xml
+++ b/res/xml/accessibility_settings_for_setup_wizard.xml
@@ -18,7 +18,7 @@
android:title="@string/vision_settings_title"
android:persistent="true" >
- <Preference
+ <com.android.settings.accessibility.DividerAllowedBelowPreference
android:key="vision_settings_summary"
android:title="@string/vision_settings_description"
android:layout="@layout/preference_multiline_title"
diff --git a/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java
new file mode 100644
index 0000000..80baaf3
--- /dev/null
+++ b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java
@@ -0,0 +1,46 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+
+/*
+ * Preference that always has a divider below. Used for SUW Accessibility Settings Summary text.
+ */
+public class DividerAllowedBelowPreference extends Preference {
+ public DividerAllowedBelowPreference(Context context) {
+ super(context);
+ }
+
+ public DividerAllowedBelowPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public DividerAllowedBelowPreference(Context context, AttributeSet attrs, int defStyleAttrs) {
+ super(context, attrs, defStyleAttrs);
+ }
+
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+ holder.setDividerAllowedBelow(true);
+ }
+}
+