Merge "Move DropDownPreference to supportlib"

src/com/android/settings/DevelopmentSettings.java

@@ -59,6 +59,7 @@ import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;

src/com/android/settings/DisplaySettings.java

@@ -33,11 +33,13 @@ import android.os.SystemProperties;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.text.TextUtils;
 import android.util.Log;
+
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.view.RotationPolicy;
 import com.android.settings.dashboard.SummaryLoader;

src/com/android/settings/DropDownPreference.java

@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2014 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.support.v7.preference.ListPreference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-
-public class DropDownPreference extends ListPreference {
-
-    private final Context mContext;
-    private final ArrayAdapter<String> mAdapter;
-    private final Spinner mSpinner;
-
-    public DropDownPreference(Context context) {
-        this(context, null);
-    }
-
-    public DropDownPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        mAdapter = new ArrayAdapter<String>(mContext,
-                android.R.layout.simple_spinner_dropdown_item);
-
-        mSpinner = new Spinner(mContext);
-
-        mSpinner.setVisibility(View.INVISIBLE);
-        mSpinner.setAdapter(mAdapter);
-        mSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
-                if (position >= 0) {
-                    String value = getEntryValues()[position].toString();
-                    if (!value.equals(getValue()) && callChangeListener(value)) {
-                        setValue(value);
-                    }
-                }
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-                // noop
-            }
-        });
-        setPersistent(false);
-        setSummary("%s");
-        updateEntries();
-    }
-
-    @Override
-    protected void onClick() {
-        mSpinner.performClick();
-    }
-
-    public void setDropDownWidth(int dimenResId) {
-        mSpinner.setDropDownWidth(mContext.getResources().getDimensionPixelSize(dimenResId));
-    }
-
-    @Override
-    public void setEntries(CharSequence[] entries) {
-        super.setEntries(entries);
-        updateEntries();
-    }
-
-    private void updateEntries() {
-        mAdapter.clear();
-        if (getEntries() != null) {
-            for (CharSequence c : getEntries()) {
-                mAdapter.add(c.toString());
-            }
-        }
-    }
-
-    @Override
-    public void setValue(String value) {
-        super.setValue(value);
-        mSpinner.setSelection(findIndexOfValue(getValue()));
-    }
-
-    public void setValueIndex(int index) {
-        setValue(getEntryValues()[index].toString());
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-        if (view.equals(mSpinner.getParent())) return;
-        if (mSpinner.getParent() != null) {
-            ((ViewGroup) mSpinner.getParent()).removeView(mSpinner);
-        }
-        final ViewGroup vg = (ViewGroup) view.itemView;
-        vg.addView(mSpinner, 0);
-        final ViewGroup.LayoutParams lp = mSpinner.getLayoutParams();
-        lp.width = 0;
-        mSpinner.setLayoutParams(lp);
-    }
-}

src/com/android/settings/applications/AppLaunchSettings.java

@@ -26,6 +26,7 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.util.ArraySet;
@@ -34,7 +35,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.Utils;
 

src/com/android/settings/nfc/NfcForegroundPreference.java

@@ -16,8 +16,8 @@
 package com.android.settings.nfc;
 
 import android.content.Context;
+import android.support.v7.preference.DropDownPreference;
 
-import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 
 public class NfcForegroundPreference extends DropDownPreference implements

src/com/android/settings/notification/ConfigureNotificationSettings.java

@@ -17,7 +17,6 @@
 package com.android.settings.notification;
 
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.DropDownPreference;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
@@ -31,6 +30,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.TwoStatePreference;

src/com/android/settings/notification/SettingPref.java

@@ -22,11 +22,11 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.provider.Settings.Global;
 import android.provider.Settings.System;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.DropDownPreference;
 import com.android.settings.SettingsPreferenceFragment;
 
 /** Helper to manage a two-state or dropdown preference bound to a global or system setting. */

src/com/android/settings/notification/ZenModeEventRuleSettings.java

@@ -26,12 +26,12 @@ import android.provider.CalendarContract.Calendars;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 import android.service.notification.ZenModeConfig.EventInfo;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 
 import java.util.ArrayList;

src/com/android/settings/notification/ZenModePrioritySettings.java

@@ -21,13 +21,13 @@ import android.app.NotificationManager.Policy;
 import android.os.Bundle;
 import android.service.notification.ZenModeConfig;
 import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.Log;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.search.Indexable;
 

src/com/android/settings/notification/ZenModeRuleSettingsBase.java

@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.service.notification.ConditionProviderService;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
@@ -39,7 +40,6 @@ import android.widget.Switch;
 import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.widget.SwitchBar;