move remaining dock settings into sound settings fragment. (2bc32ae8) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −29

Original line number	Diff line number	Diff line
		@@ -603,35 +603,6 @@
		android:resource="@id/display_settings" />
		</activity-alias>

		<activity android:name="Settings$DockSettingsActivity"
		android:label="@string/dock_settings_title"
		android:enabled="@bool/has_dock_settings"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<action android:name="com.android.settings.DOCK_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.DockSettings" />
		<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
		android:resource="@id/dock_settings" />
		</activity>

		<!-- Keep compatibility with old shortcuts. -->
		<activity-alias android:name="DockSettings"
		android:label="@string/dock_settings_title"
		android:enabled="@bool/has_dock_settings"
		android:exported="true"
		android:targetActivity="Settings$DockSettingsActivity">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.DockSettings" />
		<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
		android:resource="@id/dock_settings" />
		</activity-alias>

		<activity android:name="Settings$DeviceInfoSettingsActivity"
		android:theme="@android:style/Theme.Holo.DialogWhenLarge"
		android:label="@string/device_info_settings"

res/xml/dock_settings.xml

deleted100644 → 0

+0 −35

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- 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.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
		android:title="@string/dock_settings_title"
		android:key="parent">

		<PreferenceScreen
		android:key="dock_audio"
		android:title="@string/dock_audio_settings_title"
		android:summary="@string/dock_settings_summary" />

		<CheckBoxPreference
		android:key="dock_sounds"
		android:title="@string/dock_sounds_enable_title"
		android:summaryOn="@string/dock_sounds_enable_summary_on"
		android:summaryOff="@string/dock_sounds_enable_summary_off"
		android:defaultValue="false" />

		</PreferenceScreen>

res/xml/settings_headers.xml

+0 −7

Original line number	Diff line number	Diff line
		@@ -161,13 +161,6 @@
		<header android:id="@+id/system_section"
		android:title="@string/header_category_system" />

		<!-- Dock -->
		<header
		android:id="@+id/dock_settings"
		android:fragment="com.android.settings.DockSettings"
		android:icon="@drawable/ic_settings_dock"
		android:title="@string/dock_settings" />

		<!-- Date & Time -->
		<header
		android:id="@+id/date_time_settings"

res/xml/sound_settings.xml

+15 −0

Original line number	Diff line number	Diff line
		@@ -88,4 +88,19 @@
		android:entries="@array/emergency_tone_entries"
		android:entryValues="@array/emergency_tone_values" />

		<!-- Dock -->
		<PreferenceCategory
		android:key="dock_category"
		android:title="@string/dock_settings"/>

		<!-- Do not nest these, or removals in code will break -->
		<PreferenceScreen
		android:key="dock_audio"
		android:title="@string/dock_audio_settings_title" />

		<CheckBoxPreference
		android:key="dock_sounds"
		android:title="@string/dock_sounds_enable_title"
		android:defaultValue="false" />

		</PreferenceScreen>

src/com/android/settings/DockSettings.java

deleted100644 → 0

+0 −168

Original line number	Diff line number	Diff line
		/*
		* 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 com.android.settings.bluetooth.DockEventReceiver;

		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.bluetooth.BluetoothDevice;
		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.os.Bundle;
		import android.preference.CheckBoxPreference;
		import android.preference.Preference;
		import android.preference.PreferenceScreen;
		import android.provider.Settings;

		public class DockSettings extends SettingsPreferenceFragment {

		private static final int DIALOG_NOT_DOCKED = 1;
		private static final String KEY_AUDIO_SETTINGS = "dock_audio";
		private static final String KEY_DOCK_SOUNDS = "dock_sounds";
		private Preference mAudioSettings;
		private CheckBoxPreference mDockSounds;
		private Intent mDockIntent;

		private BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		if (intent.getAction().equals(Intent.ACTION_DOCK_EVENT)) {
		handleDockChange(intent);
		}
		}
		};

		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		addPreferencesFromResource(R.xml.dock_settings);

		initDockSettings();
		}

		@Override
		public void onResume() {
		super.onResume();

		IntentFilter filter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
		getActivity().registerReceiver(mReceiver, filter);
		}

		@Override
		public void onPause() {
		super.onPause();

		getActivity().unregisterReceiver(mReceiver);
		}

		private void initDockSettings() {
		ContentResolver resolver = getContentResolver();

		mAudioSettings = findPreference(KEY_AUDIO_SETTINGS);
		if (mAudioSettings != null) {
		mAudioSettings.setSummary(R.string.dock_audio_summary_none);
		}

		mDockSounds = (CheckBoxPreference) findPreference(KEY_DOCK_SOUNDS);
		mDockSounds.setPersistent(false);
		mDockSounds.setChecked(Settings.System.getInt(resolver,
		Settings.System.DOCK_SOUNDS_ENABLED, 0) != 0);
		}

		private void handleDockChange(Intent intent) {
		if (mAudioSettings != null) {
		int dockState = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0);

		boolean isBluetooth = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) != null;

		if (!isBluetooth) {
		// No dock audio if not on Bluetooth.
		mAudioSettings.setEnabled(false);
		mAudioSettings.setSummary(R.string.dock_audio_summary_unknown);
		} else {
		mAudioSettings.setEnabled(true);

		mDockIntent = intent;
		int resId = R.string.dock_audio_summary_unknown;
		switch (dockState) {
		case Intent.EXTRA_DOCK_STATE_CAR:
		resId = R.string.dock_audio_summary_car;
		break;
		case Intent.EXTRA_DOCK_STATE_DESK:
		case Intent.EXTRA_DOCK_STATE_LE_DESK:
		case Intent.EXTRA_DOCK_STATE_HE_DESK:
		resId = R.string.dock_audio_summary_desk;
		break;
		case Intent.EXTRA_DOCK_STATE_UNDOCKED:
		resId = R.string.dock_audio_summary_none;
		}
		mAudioSettings.setSummary(resId);
		}

		if (dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
		// remove undocked dialog if currently showing.
		try {
		removeDialog(DIALOG_NOT_DOCKED);
		} catch (IllegalArgumentException iae) {
		// Maybe it was already dismissed
		}
		}
		}
		}

		@Override
		public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
		if (preference == mAudioSettings) {
		int dockState = mDockIntent != null
		? mDockIntent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0)
		: Intent.EXTRA_DOCK_STATE_UNDOCKED;
		if (dockState == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
		showDialog(DIALOG_NOT_DOCKED);
		} else {
		Intent i = new Intent(mDockIntent);
		i.setAction(DockEventReceiver.ACTION_DOCK_SHOW_UI);
		i.setClass(getActivity(), DockEventReceiver.class);
		getActivity().sendBroadcast(i);
		}
		} else if (preference == mDockSounds) {
		Settings.System.putInt(getContentResolver(), Settings.System.DOCK_SOUNDS_ENABLED,
		mDockSounds.isChecked() ? 1 : 0);
		}

		return true;
		}

		@Override
		public Dialog onCreateDialog(int id) {
		if (id == DIALOG_NOT_DOCKED) {
		return createUndockedMessage();
		}
		return null;
		}

		private Dialog createUndockedMessage() {
		final AlertDialog.Builder ab = new AlertDialog.Builder(getActivity());
		ab.setTitle(R.string.dock_not_found_title);
		ab.setMessage(R.string.dock_not_found_text);
		ab.setPositiveButton(android.R.string.ok, null);
		return ab.create();
		}
		}