Merge "Remove useless png and add vector drawable"
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index bb77002..0351faf 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="autoclick_preference_screen"
android:title="@string/accessibility_autoclick_preference_title">
@@ -24,4 +25,9 @@
android:key="autoclick_delay"
android:title="@string/accessibility_autoclick_delay_preference_title" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="autoclick_footer"
+ android:title="@string/accessibility_autoclick_description"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 9cd3865..496c515 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="daltonizer_preference_screen"
android:title="@string/accessibility_display_daltonizer_preference_title">
@@ -27,4 +28,9 @@
android:title="@string/daltonizer_type"
android:icon="@drawable/ic_accessibility_illustration_colorblind" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="daltonizer_footer"
+ android:title="@string/accessibility_display_daltonizer_preference_subtitle"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/accessibility_shortcut_settings.xml b/res/xml/accessibility_shortcut_settings.xml
index 1245050..f431dec 100644
--- a/res/xml/accessibility_shortcut_settings.xml
+++ b/res/xml/accessibility_shortcut_settings.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/accessibility_global_gesture_preference_title" >
<Preference
@@ -24,4 +25,10 @@
<SwitchPreference
android:key="accessibility_shortcut_on_lock_screen"
android:title="@string/accessibility_shortcut_service_on_lock_screen_title"/>
+
+ <com.android.settingslib.widget.FooterPreference
+ android:key="accessibility_shortcut_footer"
+ android:title="@string/accessibility_shortcut_description"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index bb387b5..ef0f696 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -53,4 +53,10 @@
android:title="@string/voice_input_settings_title"
android:fragment="com.android.settings.applications.assist.DefaultVoiceInputPicker" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="manage_assist_footer"
+ android:title="@string/assist_footer"
+ android:selectable="false"
+ settings:searchable="false"/>
+
</PreferenceScreen>
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index de65324..cd13875 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -80,8 +80,6 @@
((Boolean) o) ? 1 : 0);
return true;
});
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.accessibility_shortcut_description);
}
@Override
@@ -186,7 +184,8 @@
return getServiceInfo(context) != null;
}
- private static @Nullable ComponentName getShortcutComponent(Context context) {
+ private static @Nullable
+ ComponentName getShortcutComponent(Context context) {
String componentNameString = AccessibilityUtils.getShortcutTargetServiceComponentNameString(
context, UserHandle.myUserId());
if (componentNameString == null) return null;
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 8e12339..49f752e 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -77,8 +77,9 @@
/**
* Gets string that should be used as a autoclick preference summary for provided autoclick
* delay.
+ *
* @param resources Resources from which string should be retrieved.
- * @param delay Delay for whose value summary should be retrieved.
+ * @param delay Delay for whose value summary should be retrieved.
*/
static CharSequence getAutoclickPreferenceSummary(Resources resources, int delay) {
int summaryIndex = getAutoclickPreferenceSummaryIndex(delay);
@@ -136,8 +137,6 @@
mDelay.setMax(delayToSeekBarProgress(MAX_AUTOCLICK_DELAY));
mDelay.setProgress(delayToSeekBarProgress(delay));
mDelay.setOnPreferenceChangeListener(this);
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.accessibility_autoclick_description);
}
@Override
@@ -166,11 +165,11 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mDelay && newValue instanceof Integer) {
Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
- seekBarProgressToDelay((int)newValue));
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
+ seekBarProgressToDelay((int) newValue));
return true;
- }
- return false;
+ }
+ return false;
}
/**
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 8924899..e307e9b 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -43,6 +43,7 @@
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
+ private static final String KEY_DALTONIZER_FOOTER = "daltonizer_footer";
private ListPreference mType;
@@ -62,10 +63,8 @@
mType = (ListPreference) findPreference("type");
- if (!ColorDisplayManager.isColorTransformAccelerated(getActivity())) {
- mFooterPreferenceMixin.createFooterPreference().setTitle(
- R.string.accessibility_display_daltonizer_preference_subtitle);
- }
+ final Preference footer = findPreference(KEY_DALTONIZER_FOOTER);
+ footer.setVisible(!ColorDisplayManager.isColorTransformAccelerated(getActivity()));
initPreferences();
}
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
index 952a3ad..ae2728d 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -68,14 +68,6 @@
use(AssistGestureSettingsPreferenceController.class).setAssistOnly(true);
}
- @Override
- public void onResume() {
- super.onResume();
-
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.assist_footer);
- }
-
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index 4c00c3e..d4f1283 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -32,7 +32,6 @@
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import com.google.android.collect.Lists;
@@ -61,10 +60,8 @@
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
super.onCreatePreferences(savedInstanceState, rootKey);
- FooterPreferenceMixinCompat footer = new FooterPreferenceMixinCompat(this,
- this.getSettingsLifecycle());
- FooterPreference pref = footer.createFooterPreference();
- pref.setTitle(R.string.usb_default_info);
+ getPreferenceScreen().addPreference(new FooterPreference.Builder(getActivity()).setTitle(
+ R.string.usb_default_info).build());
}
@Override