From 62f05a1bf7da5866c5a6d1df982ce7005e4ac8fe Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Thu, 12 Jun 2014 18:04:33 -0700 Subject: Remove old preference activity * Also cleanup & remove unused strings Change-Id: I0b9f2405ab98b0df612a18ccfaa5d9ba98876d8a --- AndroidManifest.xml | 9 - .../android/launcher3/WallpaperPickerActivity.java | 19 -- res/layout/settings_transitions_screen.xml | 4 +- res/values/cm_arrays.xml | 29 +-- res/values/cm_strings.xml | 107 +++----- res/xml/preferences_drawer.xml | 42 ---- res/xml/preferences_general.xml | 34 --- res/xml/preferences_headers.xml | 41 --- res/xml/preferences_homescreen.xml | 29 --- .../list/SettingsPinnedHeaderAdapter.java | 2 +- .../launcher3/settings/SettingsActivity.java | 274 --------------------- 11 files changed, 42 insertions(+), 548 deletions(-) delete mode 100644 res/xml/preferences_drawer.xml delete mode 100644 res/xml/preferences_general.xml delete mode 100644 res/xml/preferences_headers.xml delete mode 100644 res/xml/preferences_homescreen.xml delete mode 100644 src/com/android/launcher3/settings/SettingsActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5c645e3b3..34e25b8b4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -88,15 +88,6 @@ - - - - - - - - - \ No newline at end of file + diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 2320f1805..e8b02dbcb 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -15,30 +15,19 @@ limitations under the License. --> - - Regular - Light - Condensed - - - sans-serif - sans-serif-light - sans-serif-condensed - - None - Zoom In - Zoom Out - Rotate Up - Rotate Down - Cube In - Cube Out + Zoom in + Zoom out + Rotate up + Rotate down + Cube in + Cube out Stack Accordion Flip - Cylinder In - Cylinder Out + Cylinder in + Cylinder out Carousel Overview @@ -74,4 +63,4 @@ @drawable/transition_carousel @drawable/transition_overview - \ No newline at end of file + diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 854db56ff..7ec28ab21 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -17,109 +17,62 @@ Trebuchet - - Copyright \u00A9 2014 The CyanogenMod Project 1.0 - - - Sort - - Filter - - Default screen - - Scroll effect + LAUNCHER SETTINGS + HOME SCREEN SETTINGS + DRAWER SETTINGS - Title - Launch count - Install time + + ON + OFF + + + Themes Page outlines Fade side pages - - Scroll wallpaper - - - Settings - - App - - - - Homescreen - Search bar - Show persistent search bar at top of screen - Hide icon labels - Hide icon labels on homescreen - - - Drawer - Apps and widgets drawer - Apps - Hidden apps - Hide apps from the drawer - Remove shortcuts - Remove the shortcuts of hidden apps from the homescreen - Remove widgets - Remove the widgets of hidden apps from the homescreen - Hide icon labels - Hide icon labels in drawer - - - You must have a supported search app and CyanogenMod to use this feature. - - - Dock + + Scroll wallpaper - General - Icons - Larger icons - Use extra large application icons in homescreen and drawer - Text font style - Variant and style of font to use for icon text Pick icon pack Default icons - Icon packs No icon packs installed Google - - Reset - Hidden apps - LAUNCHER SETTINGS - HOME SCREEN SETTINGS - DRAWER SETTINGS - + + Scroll effect - + + Sorting mode - + + Title + Launch count + Install time + + Search bar - + + Larger icons - + + Hide icon labels - + + Protected apps + Search panel - - ON - OFF - - Themes - - Scroll wallpaper - - locked - unlocked + + You must have a supported search app and CyanogenMod to use this feature. diff --git a/res/xml/preferences_drawer.xml b/res/xml/preferences_drawer.xml deleted file mode 100644 index b22597516..000000000 --- a/res/xml/preferences_drawer.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml deleted file mode 100644 index 96b93ec44..000000000 --- a/res/xml/preferences_general.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml deleted file mode 100644 index 42a08a9bd..000000000 --- a/res/xml/preferences_headers.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - -
- -
- - - -
- -
- -
- - diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml deleted file mode 100644 index 1754cfa02..000000000 --- a/res/xml/preferences_homescreen.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - 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
target) { - loadHeadersFromResource(R.xml.preferences_headers, target); - updateHeaders(target); - } - - private void updateHeaders(List
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
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
getHeadersFromAdapter(ListAdapter adapter) { - List
headers = new ArrayList
(); - 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
{ - 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
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; - } - } -} -- cgit v1.2.3