diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml deleted file mode 100644 index e5c58d00b9e..00000000000 --- a/res/layout/dream_picker_row.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index b5f072fa2e7..d6ffc6cd86f 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -40,11 +40,6 @@ android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> - - - - - - - - - - - - - diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index d2c227b3f5d..58871405c6f 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -39,8 +39,6 @@ import android.util.Log; import android.view.IWindowManager; import android.view.Surface; -import com.android.settings.DreamSettings; - import java.util.ArrayList; public class DisplaySettings extends SettingsPreferenceFragment implements @@ -54,7 +52,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private static final String KEY_ACCELEROMETER = "accelerometer"; private static final String KEY_FONT_SIZE = "font_size"; private static final String KEY_NOTIFICATION_PULSE = "notification_pulse"; - private static final String KEY_SCREEN_SAVER = "screensaver"; private CheckBoxPreference mAccelerometer; private ListPreference mFontSizePref; @@ -63,7 +60,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private final Configuration mCurConfig = new Configuration(); private ListPreference mScreenTimeoutPreference; - private Preference mScreenSaverPreference; private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) { @Override @@ -82,8 +78,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER); mAccelerometer.setPersistent(false); - mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER); - mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT); final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE); @@ -219,14 +213,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private void updateState() { updateAccelerometerRotationCheckbox(); readFontSizePreference(mFontSizePref); - updateScreenSaverSummary(); - } - - private void updateScreenSaverSummary() { - mScreenSaverPreference.setSummary( - DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext()) - ? R.string.screensaver_settings_summary_on - : R.string.screensaver_settings_summary_off); } private void updateAccelerometerRotationCheckbox() { diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java deleted file mode 100644 index b41ab3aa42c..00000000000 --- a/src/com/android/settings/DreamComponentPreference.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (C) 2011 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 static android.provider.Settings.Secure.SCREENSAVER_COMPONENT; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.ComponentName; -import android.content.ContentResolver; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.content.res.Resources; -import android.preference.Preference; -import android.provider.Settings; -import android.util.AttributeSet; -import android.util.Log; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.ListAdapter; -import android.widget.TextView; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -public class DreamComponentPreference extends Preference { - private static final String TAG = "DreamComponentPreference"; - - private static final boolean SHOW_DOCK_APPS_TOO = true; - - private final PackageManager pm; - private final ContentResolver resolver; - - public DreamComponentPreference(Context context, AttributeSet attrs) { - super(context, attrs); - pm = getContext().getPackageManager(); - resolver = getContext().getContentResolver(); - - refreshFromSettings(); - } - - private void refreshFromSettings() { - String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT); - if (component == null) { - component = getContext().getResources().getString( - com.android.internal.R.string.config_defaultDreamComponent); - } - if (component != null) { - ComponentName cn = ComponentName.unflattenFromString(component); - try { - setSummary(pm.getActivityInfo(cn, 0).loadLabel(pm)); - } catch (PackageManager.NameNotFoundException ex) { - setSummary("(unknown)"); - } - } - } - - final static Comparator sResolveInfoComparator = new Comparator() { - @Override - public int compare(ResolveInfo a, ResolveInfo b) { - int cmp = a.activityInfo.applicationInfo.packageName.compareTo( - b.activityInfo.applicationInfo.packageName); - if (cmp == 0) { - cmp = a.activityInfo.name.compareTo(b.activityInfo.name); - } - return cmp; - } - }; - - public class DreamListAdapter extends BaseAdapter implements ListAdapter { - private ArrayList results; - private final LayoutInflater inflater; - - public DreamListAdapter(Context context) { - Intent choosy = new Intent(Intent.ACTION_MAIN) - .addCategory("android.intent.category.DREAM"); - - inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - results = new ArrayList(pm.queryIntentActivities(choosy, 0)); - - // Group by package - Collections.sort(results, sResolveInfoComparator); - - if (SHOW_DOCK_APPS_TOO) { - choosy = new Intent(Intent.ACTION_MAIN) - .addCategory(Intent.CATEGORY_DESK_DOCK); - - List dockApps = pm.queryIntentActivities(choosy, 0); - for (ResolveInfo app : dockApps) { - // do not insert duplicate packages - int pos = Collections.binarySearch(results, app, sResolveInfoComparator); - if (pos < 0) { - results.add(-1-pos, app); - } - } - } - } - - @Override - public int getCount() { - return results.size(); - } - - @Override - public Object getItem(int position) { - return results.get(position); - } - - @Override - public long getItemId (int position) { - return (long) position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - View row = (convertView != null) - ? convertView - : inflater.inflate(R.layout.dream_picker_row, parent, false); - ResolveInfo ri = results.get(position); - ((TextView)row.findViewById(R.id.title)).setText(ri.loadLabel(pm)); - ((ImageView)row.findViewById(R.id.icon)).setImageDrawable(ri.loadIcon(pm)); - return row; - } - } - - @Override - protected void onClick() { - final DreamListAdapter list = new DreamListAdapter(getContext()); - AlertDialog alert = new AlertDialog.Builder(getContext()) - .setAdapter( - list, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - ResolveInfo ri = (ResolveInfo)list.getItem(which); - ActivityInfo act = ri.activityInfo; - ComponentName cn = new ComponentName( - act.applicationInfo.packageName, - act.name); - Intent intent = new Intent(Intent.ACTION_MAIN).setComponent(cn); - - setSummary(ri.loadLabel(pm)); - //getContext().startActivity(intent); - - Settings.Secure.putString(resolver, SCREENSAVER_COMPONENT, cn.flattenToString()); - } - }) - .create(); - alert.show(); - } -} diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java deleted file mode 100644 index d9953aafcfb..00000000000 --- a/src/com/android/settings/DreamSettings.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (C) 2010 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 static android.provider.Settings.Secure.SCREENSAVER_ENABLED; -import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK; - -import android.app.ActionBar; -import android.app.Activity; -import android.app.ActivityManagerNative; -import android.app.admin.DevicePolicyManager; -import android.content.ContentResolver; -import android.content.Context; -import android.content.res.Configuration; -import android.database.ContentObserver; -import android.os.Bundle; -import android.os.Handler; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.preference.CheckBoxPreference; -import android.preference.ListPreference; -import android.preference.Preference; -import android.preference.PreferenceActivity; -import android.preference.PreferenceScreen; -import android.provider.Settings; -import android.util.Log; -import android.view.Gravity; -import android.view.IWindowManager; -import android.widget.CompoundButton; -import android.widget.Switch; - -import java.util.ArrayList; - -public class DreamSettings extends SettingsPreferenceFragment { - private static final String TAG = "DreamSettings"; - - private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock"; - - private CheckBoxPreference mActivateOnDockPreference; - - private Switch mEnableSwitch; - private Enabler mEnabler; - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - addPreferencesFromResource(R.xml.dream_settings); - - mActivateOnDockPreference = (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK); - - final Activity activity = getActivity(); - - mEnableSwitch = new Switch(activity); - - if (activity instanceof PreferenceActivity) { - PreferenceActivity preferenceActivity = (PreferenceActivity) activity; - // note: we do not check onIsHidingHeaders() or onIsMultiPane() because there's no - // switch in the left-hand pane to control this; we need to show the ON/OFF in our - // fragment every time - final int padding = activity.getResources().getDimensionPixelSize( - R.dimen.action_bar_switch_padding); - mEnableSwitch.setPadding(0, 0, padding, 0); - activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, - ActionBar.DISPLAY_SHOW_CUSTOM); - activity.getActionBar().setCustomView(mEnableSwitch, new ActionBar.LayoutParams( - ActionBar.LayoutParams.WRAP_CONTENT, - ActionBar.LayoutParams.WRAP_CONTENT, - Gravity.CENTER_VERTICAL | Gravity.RIGHT)); - activity.getActionBar().setTitle(R.string.screensaver_settings_title); - } - - mEnabler = new Enabler(activity, mEnableSwitch); - } - - public static boolean isScreenSaverEnabled(Context context) { - return 0 != Settings.Secure.getInt( - context.getContentResolver(), SCREENSAVER_ENABLED, 1); - } - - public static void setScreenSaverEnabled(Context context, boolean enabled) { - Settings.Secure.putInt( - context.getContentResolver(), SCREENSAVER_ENABLED, enabled ? 1 : 0); - } - - public static class Enabler implements CompoundButton.OnCheckedChangeListener { - private final Context mContext; - private Switch mSwitch; - - public Enabler(Context context, Switch switch_) { - mContext = context; - setSwitch(switch_); - } - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - setScreenSaverEnabled(mContext, isChecked); - } - public void setSwitch(Switch switch_) { - if (mSwitch == switch_) return; - if (mSwitch != null) mSwitch.setOnCheckedChangeListener(null); - mSwitch = switch_; - mSwitch.setOnCheckedChangeListener(this); - - final boolean enabled = isScreenSaverEnabled(mContext); - mSwitch.setChecked(enabled); - } - public void pause() { - mSwitch.setOnCheckedChangeListener(null); - } - public void resume() { - mSwitch.setOnCheckedChangeListener(this); - } - } - - @Override - public void onResume() { - if (mEnabler != null) { - mEnabler.resume(); - } - - final boolean currentActivateOnDock = 0 != Settings.Secure.getInt(getContentResolver(), - SCREENSAVER_ACTIVATE_ON_DOCK, 1); - mActivateOnDockPreference.setChecked(currentActivateOnDock); - super.onResume(); - } - - @Override - public void onPause() { - if (mEnabler != null) { - mEnabler.pause(); - } - - super.onPause(); - } - - @Override - public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { - if (preference == mActivateOnDockPreference) { - Settings.Secure.putInt(getContentResolver(), - SCREENSAVER_ACTIVATE_ON_DOCK, - mActivateOnDockPreference.isChecked() ? 1 : 0); - } - return super.onPreferenceTreeClick(preferenceScreen, preference); - } -} diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java deleted file mode 100644 index ccd6fc060ec..00000000000 --- a/src/com/android/settings/DreamTesterPreference.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2011 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 static android.provider.Settings.Secure.SCREENSAVER_COMPONENT; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.ComponentName; -import android.content.ContentResolver; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.content.res.Resources; -import android.preference.Preference; -import android.provider.Settings; -import android.util.AttributeSet; -import android.util.Log; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.ListAdapter; -import android.widget.TextView; - -import java.util.ArrayList; -import java.util.List; - -public class DreamTesterPreference extends Preference { - private static final String TAG = "DreamTesterPreference"; - - private final PackageManager pm; - private final ContentResolver resolver; - - public DreamTesterPreference(Context context, AttributeSet attrs) { - super(context, attrs); - pm = getContext().getPackageManager(); - resolver = getContext().getContentResolver(); - } - - @Override - protected void onClick() { - String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT); - Log.v(TAG, "component=" + component); - if (component != null) { - ComponentName cn = ComponentName.unflattenFromString(component); - Log.v(TAG, "cn=" + cn); - Intent intent = new Intent(Intent.ACTION_MAIN) - .setComponent(cn) - .addFlags( - Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS - ) - .putExtra("android.dreams.TEST", true); - getContext().startActivity(intent); - } - } -}