summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DreamSettings.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-08-22 09:21:58 -0400
committerJohn Spurlock <jspurlock@google.com>2012-08-29 16:41:01 -0400
commit6df18e2713a15a52567ac1a833953ac4bfa38f15 (patch)
treeaed4f01d174b23d2dee2fd912f82fbf74bb171de /src/com/android/settings/DreamSettings.java
parentc6015d2f593d0e5ef909d7157df4b15831236acb (diff)
downloadpackages_apps_Settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.zip
packages_apps_Settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.tar.gz
packages_apps_Settings-6df18e2713a15a52567ac1a833953ac4bfa38f15.tar.bz2
New dream settings - first cut
First draft implementation of mocks for dream settings. Want to merge for the weekly build, so a few things remain, namely: - flat style for preview/settings buttons + dividers - animation between dream row expanded/collapsed state - wire up the help url - possibly ditch the non-standard style - add logging - refresh when packages are installed/uninstalled Bug:7010260 Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262
Diffstat (limited to 'src/com/android/settings/DreamSettings.java')
-rw-r--r--src/com/android/settings/DreamSettings.java341
1 files changed, 250 insertions, 91 deletions
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 071e369..d2d470f 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * Copyright (C) 2012 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.
@@ -16,136 +16,295 @@
package com.android.settings;
-import static android.provider.Settings.Secure.SCREENSAVER_ENABLED;
-import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
-import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP;
-
import android.app.ActionBar;
import android.app.Activity;
-import android.app.ActivityManagerNative;
-import android.app.admin.DevicePolicyManager;
-import android.content.ContentResolver;
+import android.app.AlertDialog;
+import android.app.Dialog;
import android.content.Context;
-import android.content.res.Configuration;
-import android.database.ContentObserver;
+import android.content.DialogInterface;
+import android.graphics.Color;
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.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.RadioButton;
import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.settings.DreamBackend.DreamInfo;
-import java.util.ArrayList;
+import java.util.List;
public class DreamSettings extends SettingsPreferenceFragment {
- private static final String TAG = "DreamSettings";
+ private static final int DIALOG_WHEN_TO_DREAM = 1;
+ private static final int DIVIDER_HEIGHT = 15;
- private static final String KEY_ACTIVATE_ON_SLEEP = "activate_on_sleep";
- private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock";
- private static final String KEY_COMPONENT = "screensaver_component";
- private static final String KEY_TEST = "test";
+ private Context mContext;
+ private DreamBackend mBackend;
+ private DreamInfoAdapter mAdapter;
+ private Switch mSwitch;
+ private MenuItem[] mDependentMenuItems;
+ private boolean mRefreshing;
- private static final int DEFAULT_SLEEP = 1;
- private static final int DEFAULT_DOCK = 1;
+ @Override
+ public void onAttach(Activity activity) {
+ super.onAttach(activity);
+ mContext = activity;
+ }
- private ActivationSetting mActivateOnSleep;
- private ActivationSetting mActivateOnDock;
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ Activity activity = getActivity();
- private Preference mComponentPref;
- private Preference mTestPref;
+ mBackend = new DreamBackend(activity);
+ mSwitch = new Switch(activity);
+ mSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (!mRefreshing) {
+ mBackend.setEnabled(isChecked);
+ refreshFromBackend();
+ }
+ }
+ });
+ if (activity instanceof PreferenceActivity) {
+ PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+ if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
+ final int padding = activity.getResources().getDimensionPixelSize(
+ R.dimen.action_bar_switch_padding);
+ mSwitch.setPadding(0, 0, padding, 0);
+ activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+ ActionBar.DISPLAY_SHOW_CUSTOM);
+ activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ Gravity.CENTER_VERTICAL | Gravity.END));
+ }
+ }
+ setHasOptionsMenu(true);
+ }
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- addPreferencesFromResource(R.xml.dream_settings);
+ ListView listView = getListView();
- mComponentPref = findPreference(KEY_COMPONENT);
- mTestPref = findPreference(KEY_TEST);
+ TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+ emptyView.setText(R.string.screensaver_settings_disabled_prompt);
+ listView.setEmptyView(emptyView);
- mActivateOnSleep = new ActivationSetting(getActivity(),
- SCREENSAVER_ACTIVATE_ON_SLEEP, DEFAULT_SLEEP,
- (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_SLEEP));
- mActivateOnDock = new ActivationSetting(getActivity(),
- SCREENSAVER_ACTIVATE_ON_DOCK, DEFAULT_DOCK,
- (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK));
+ mAdapter = new DreamInfoAdapter(mContext);
+ listView.setAdapter(mAdapter);
+ listView.setDivider(null);
+ listView.setDividerHeight(DIVIDER_HEIGHT);
+ listView.setBackgroundColor(Color.BLACK);
+ listView.setPadding(0, DIVIDER_HEIGHT, 0, DIVIDER_HEIGHT);
+ listView.setHeaderDividersEnabled(true);
}
- public static boolean isScreenSaverActivatedOnSleep(Context context) {
- return 0 != Settings.Secure.getInt(
- context.getContentResolver(), SCREENSAVER_ACTIVATE_ON_SLEEP, DEFAULT_SLEEP);
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ boolean isEnabled = mBackend.isEnabled();
+
+ MenuItem whenToDream = createMenuItem(menu,
+ R.string.screensaver_settings_when_to_dream,
+ MenuItem.SHOW_AS_ACTION_NEVER,
+ isEnabled,
+ new Runnable() {
+ @Override
+ public void run() {
+ showDialog(DIALOG_WHEN_TO_DREAM);
+ }});
+
+ createMenuItem(menu,
+ R.string.help_label,
+ MenuItem.SHOW_AS_ACTION_NEVER,
+ true,
+ new Runnable() {
+ @Override
+ public void run() {
+ // TODO show help url
+ }});
+
+ MenuItem startDreaming = createMenuItem(menu,
+ R.string.screensaver_settings_start_dreaming,
+ MenuItem.SHOW_AS_ACTION_ALWAYS,
+ isEnabled,
+ new Runnable(){
+ @Override
+ public void run() {
+ mBackend.startDreamingNow();
+ }});
+
+ mDependentMenuItems = new MenuItem[] { whenToDream, startDreaming };
}
- public static boolean isScreenSaverActivatedOnDock(Context context) {
- return 0 != Settings.Secure.getInt(
- context.getContentResolver(), SCREENSAVER_ACTIVATE_ON_DOCK, DEFAULT_DOCK);
+ private MenuItem createMenuItem(Menu menu,
+ int titleRes, int actionEnum, boolean isEnabled, final Runnable onClick) {
+ MenuItem item = menu.add(titleRes);
+ item.setShowAsAction(actionEnum);
+ item.setEnabled(isEnabled);
+ item.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ onClick.run();
+ return true;
+ }
+ });
+ return item;
+ }
+
+ @Override
+ public Dialog onCreateDialog(int dialogId) {
+ if (dialogId == DIALOG_WHEN_TO_DREAM)
+ return createWhenToDreamDialog();
+ return super.onCreateDialog(dialogId);
+ }
+
+ private Dialog createWhenToDreamDialog() {
+ final CharSequence[] items = {
+ mContext.getString(R.string.screensaver_settings_summary_dock),
+ mContext.getString(R.string.screensaver_settings_summary_sleep),
+ mContext.getString(R.string.screensaver_settings_summary_either_short)
+ };
+
+ int initialSelection = mBackend.isActivatedOnDock() && mBackend.isActivatedOnSleep() ? 2
+ : mBackend.isActivatedOnDock() ? 0
+ : mBackend.isActivatedOnSleep() ? 1
+ : -1;
+
+ return new AlertDialog.Builder(mContext)
+ .setTitle(R.string.screensaver_settings_when_to_dream)
+ .setSingleChoiceItems(items, initialSelection, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int item) {
+ mBackend.setActivatedOnDock(item == 0 || item == 2);
+ mBackend.setActivatedOnSleep(item == 1 || item == 2);
+ }
+ })
+ .create();
}
@Override
public void onResume() {
- mActivateOnSleep.onResume();
- mActivateOnDock.onResume();
- refreshDependents();
super.onResume();
+ refreshFromBackend();
}
- @Override
- public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- mActivateOnSleep.onClick(preference);
- mActivateOnDock.onClick(preference);
-
- // FIXME: infer enabled (until the next rev of the dream settings ui)
- boolean enabled = mActivateOnSleep.isSelected() || mActivateOnDock.isSelected();
- Settings.Secure.putInt(getActivity().getContentResolver(),
- SCREENSAVER_ENABLED,
- enabled ? 1 : 0);
-
- refreshDependents();
- return super.onPreferenceTreeClick(preferenceScreen, preference);
+ public static int getSummaryResource(Context context) {
+ DreamBackend backend = new DreamBackend(context);
+ boolean isEnabled = backend.isEnabled();
+ boolean activatedOnSleep = backend.isActivatedOnSleep();
+ boolean activatedOnDock = backend.isActivatedOnDock();
+ boolean activatedOnEither = activatedOnSleep && activatedOnDock;
+ return !isEnabled ? R.string.screensaver_settings_summary_off
+ : activatedOnEither ? R.string.screensaver_settings_summary_either_long
+ : activatedOnSleep ? R.string.screensaver_settings_summary_sleep
+ : activatedOnDock ? R.string.screensaver_settings_summary_dock
+ : 0;
}
- private void refreshDependents() {
- boolean enabled = mActivateOnSleep.isSelected() || mActivateOnDock.isSelected();
- mComponentPref.setEnabled(enabled);
- mTestPref.setEnabled(enabled);
+ private void refreshFromBackend() {
+ mRefreshing = true;
+ boolean dreamsEnabled = mBackend.isEnabled();
+ if (mSwitch.isChecked() != dreamsEnabled)
+ mSwitch.setChecked(dreamsEnabled);
+
+ mAdapter.clear();
+ if (dreamsEnabled) {
+ List<DreamInfo> dreamInfos = mBackend.getDreamInfos();
+ mAdapter.addAll(dreamInfos);
+ }
+ if (mDependentMenuItems != null)
+ for (MenuItem item : mDependentMenuItems)
+ item.setEnabled(dreamsEnabled);
+ mRefreshing = false;
}
- private static class ActivationSetting {
- private final Context mContext;
- private final String mName;
- private final int mDefaultValue;
- private final CheckBoxPreference mPref;
-
- ActivationSetting(Context context, String name, int defaultValue, CheckBoxPreference pref) {
- mContext = context;
- mName = name;
- mDefaultValue = defaultValue;
- mPref = pref;
+ private class DreamInfoAdapter extends ArrayAdapter<DreamInfo> {
+ private final LayoutInflater mInflater;
+
+ public DreamInfoAdapter(Context context) {
+ super(context, 0);
+ mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
- public boolean isSelected() {
- return mPref.isChecked();
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ DreamInfo dreamInfo = getItem(position);
+ final View row = convertView != null ? convertView : createDreamInfoRow(parent);
+ row.setTag(dreamInfo);
+
+ // bind icon
+ ((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(dreamInfo.icon);
+
+ // bind caption
+ ((TextView) row.findViewById(android.R.id.text1)).setText(dreamInfo.caption);
+
+ // bind radio button
+ ((RadioButton) row.findViewById(android.R.id.button1)).setChecked(dreamInfo.isActive);
+ ((RadioButton) row.findViewById(android.R.id.button1)).setOnTouchListener(new OnTouchListener() {
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ row.onTouchEvent(event);
+ return false;
+ }});
+
+ // bind button container
+ row.findViewById(android.R.id.widget_frame).setVisibility(dreamInfo.isActive ? View.VISIBLE : View.GONE);
+
+ // bind settings button
+ ((Button) row.findViewById(android.R.id.button2)).setEnabled(dreamInfo.settingsComponentName != null);
+ ((Button) row.findViewById(android.R.id.button2)).setOnClickListener(new OnClickListener(){
+ @Override
+ public void onClick(View v) {
+ mBackend.launchSettings((DreamInfo)row.getTag());
+ }});
+
+ // bind preview button
+ ((Button) row.findViewById(android.R.id.button3)).setOnClickListener(new OnClickListener(){
+ @Override
+ public void onClick(View v) {
+ mBackend.preview((DreamInfo)row.getTag());
+ }});
+
+ return row;
}
- void onClick(Preference preference) {
- if (preference == mPref) {
- Settings.Secure.putInt(mContext.getContentResolver(),
- mName,
- mPref.isChecked() ? 1 : 0);
- }
+
+ private View createDreamInfoRow(ViewGroup parent) {
+ final View row = mInflater.inflate(R.layout.dream_info_row, parent, false);
+ row.setOnClickListener(new OnClickListener(){
+ @Override
+ public void onClick(View v) {
+ v.setPressed(true);
+ activate((DreamInfo) row.getTag());
+ }});
+ return row;
}
- void onResume() {
- boolean currentActivated = 0 != Settings.Secure.getInt(mContext.getContentResolver(),
- mName, mDefaultValue);
- mPref.setChecked(currentActivated);
+
+ private void activate(DreamInfo dreamInfo) {
+ for (int i = 0; i < getCount(); i++) {
+ getItem(i).isActive = false;
+ }
+ dreamInfo.isActive = true;
+ mBackend.setActiveDream(dreamInfo.componentName);
+ notifyDataSetChanged();
}
}
-
}