Remove old preference activity

* Also cleanup & remove unused strings

Change-Id: I0b9f2405ab98b0df612a18ccfaa5d9ba98876d8a

2 files changed, 1 insertions, 275 deletions

diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index 3978b0ea7..ccfe0b1ba 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -270,7 +270,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                 // If GEL integration is not supported, do not allow the user to turn it on.
                 if(!current && !mLauncher.isGelIntegrationSupported()) {
                     Toast.makeText(mLauncher.getApplicationContext(),
-                            res.getString(R.string.preferences_search_screen_left_unsupported_toast),
+                            res.getString(R.string.search_screen_left_unsupported_toast),
                             Toast.LENGTH_SHORT).show();
                 } else {
                     onSettingsBooleanChanged(
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
deleted file mode 100644
index dbbf95f52..000000000
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2013 The CyanogenMod 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.launcher3.settings;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.*;
-import android.text.TextUtils;
-import android.view.MenuItem;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-import com.android.launcher3.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SettingsActivity extends PreferenceActivity
-        implements SharedPreferences.OnSharedPreferenceChangeListener {
-    private static final String TAG = "Launcher3.SettingsActivity";
-
-    private SharedPreferences mSettings;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mSettings = getSharedPreferences(SettingsProvider.SETTINGS_KEY,
-                Context.MODE_PRIVATE);
-
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-    }
-
-    @Override
-    public SharedPreferences getSharedPreferences(String name, int mode) {
-        return super.getSharedPreferences(SettingsProvider.SETTINGS_KEY,
-                Context.MODE_PRIVATE);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mSettings.registerOnSharedPreferenceChangeListener(this);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mSettings.unregisterOnSharedPreferenceChangeListener(this);
-    }
-
-    @Override
-    public boolean isValidFragment(String fragmentName) {
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                onBackPressed();
-                finish();
-                return true;
-            default:
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBuildHeaders(List<Header> target) {
-        loadHeadersFromResource(R.xml.preferences_headers, target);
-        updateHeaders(target);
-    }
-
-    private void updateHeaders(List<Header> headers) {
-        int i = 0;
-        while (i < headers.size()) {
-            Header header = headers.get(i);
-
-            // Version preference
-            if (header.id == R.id.preferences_application_version) {
-                header.title = getString(R.string.cm_application_name) + " " + getString(R.string.application_version);
-            }
-
-            // Increment if not removed
-            if (headers.get(i) == header) {
-                i++;
-            }
-        }
-    }
-
-    @Override
-    public void setListAdapter(ListAdapter adapter) {
-        if (adapter == null) {
-            super.setListAdapter(null);
-        } else {
-            List<Header> headers = getHeadersFromAdapter(adapter);
-            super.setListAdapter(new HeaderAdapter(this, headers));
-        }
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        SharedPreferences.Editor editor = mSettings.edit();
-        editor.putBoolean(SettingsProvider.SETTINGS_CHANGED, true);
-        editor.commit();
-    }
-
-    private List<Header> getHeadersFromAdapter(ListAdapter adapter) {
-        List<Header> headers = new ArrayList<Header>();
-        int count = adapter.getCount();
-        for (int i = 0; i < count; i++) {
-            headers.add((Header)adapter.getItem(i));
-        }
-        return headers;
-    }
-
-    public static class HomescreenFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            addPreferencesFromResource(R.xml.preferences_homescreen);
-        }
-    }
-
-    public static class GeneralFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            addPreferencesFromResource(R.xml.preferences_general);
-        }
-    }
-
-    public static class DrawerFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            addPreferencesFromResource(R.xml.preferences_drawer);
-        }
-    }
-
-    private static class HeaderAdapter extends ArrayAdapter<Header> {
-        private static final int HEADER_TYPE_NORMAL = 0;
-        private static final int HEADER_TYPE_CATEGORY = 1;
-
-        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_CATEGORY + 1;
-
-        private static class HeaderViewHolder {
-            ImageView icon;
-            TextView title;
-            TextView summary;
-        }
-
-        private LayoutInflater mInflater;
-
-        static int getHeaderType(Header header) {
-            if (header.id == R.id.preferences_application_section) {
-                return HEADER_TYPE_CATEGORY;
-            } else {
-                return HEADER_TYPE_NORMAL;
-            }
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            Header header = getItem(position);
-            return getHeaderType(header);
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false; // because of categories
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return getItemViewType(position) != HEADER_TYPE_CATEGORY;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return HEADER_TYPE_COUNT;
-        }
-
-        @Override
-        public boolean hasStableIds() {
-            return true;
-        }
-
-        public HeaderAdapter(Context context, List<Header> objects) {
-            super(context, 0, objects);
-
-            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            HeaderViewHolder holder;
-            Header header = getItem(position);
-            int headerType = getHeaderType(header);
-            View view = null;
-
-            if (convertView == null) {
-                holder = new HeaderViewHolder();
-                switch (headerType) {
-                    case HEADER_TYPE_CATEGORY:
-                        view = new TextView(getContext(), null,
-                                android.R.attr.listSeparatorTextViewStyle);
-                        holder.title = (TextView) view;
-                        break;
-
-                    case HEADER_TYPE_NORMAL:
-                        view = mInflater.inflate(
-                                R.layout.preference_header_item, parent,
-                                false);
-                        holder.icon = (ImageView) view.findViewById(android.R.id.icon);
-                        holder.title = (TextView)
-                                view.findViewById(android.R.id.title);
-                        holder.summary = (TextView)
-                                view.findViewById(android.R.id.summary);
-                        break;
-                }
-                view.setTag(holder);
-            } else {
-                view = convertView;
-                holder = (HeaderViewHolder) view.getTag();
-            }
-
-            // All view fields must be updated every time, because the view may be recycled
-            switch (headerType) {
-                case HEADER_TYPE_CATEGORY:
-                    holder.title.setText(header.getTitle(getContext().getResources()));
-                    break;
-
-                case HEADER_TYPE_NORMAL:
-                    holder.icon.setImageResource(header.iconRes);
-                    holder.title.setText(header.getTitle(getContext().getResources()));
-                    CharSequence summary = header.getSummary(getContext().getResources());
-                    if (!TextUtils.isEmpty(summary)) {
-                        holder.summary.setVisibility(View.VISIBLE);
-                        holder.summary.setText(summary);
-                    } else {
-                        holder.summary.setVisibility(View.GONE);
-                    }
-                    break;
-            }
-
-            return view;
-        }
-    }
-}