summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorJake Hamby <jhamby@google.com>2011-07-12 11:05:46 -0700
committerJake Hamby <jhamby@google.com>2011-07-15 15:39:53 -0700
commitca9812a8521fcc483e821fd5a88ec421de0b8f66 (patch)
treeb36e95ccdc5fdce27a8ea5f1ab457adbca9f502c /res/xml
parentaa5b531b0b540488f47ad0414dc77eecbb47cd3a (diff)
downloadpackages_apps_settings-ca9812a8521fcc483e821fd5a88ec421de0b8f66.zip
packages_apps_settings-ca9812a8521fcc483e821fd5a88ec421de0b8f66.tar.gz
packages_apps_settings-ca9812a8521fcc483e821fd5a88ec421de0b8f66.tar.bz2
Upgrade Bluetooth pairing dialogs for ICS.
* Change Bluetooth pairing dialogs to match ICS wireframes. * Default to numeric soft keyboard for PIN entry, and add checkbox to allow user to switch to alphanumeric keyboard if necessary. * Move all Bluetooth advanced settings into action bar menu. * Toggle visibility by touching "My device" entry in devices list. Change-Id: Ic2377eb4364f41d215181cb1e3933997c9db9106
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/bluetooth_advanced_settings.xml47
1 files changed, 0 insertions, 47 deletions
diff --git a/res/xml/bluetooth_advanced_settings.xml b/res/xml/bluetooth_advanced_settings.xml
deleted file mode 100644
index 345b3bf..0000000
--- a/res/xml/bluetooth_advanced_settings.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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"
- android:title="@string/bluetooth_advanced_titlebar">
-
- <com.android.settings.bluetooth.BluetoothNamePreference
- android:key="bt_name"
- android:title="@string/bluetooth_device_name"
- android:summary="@string/bluetooth_name_not_set"
- android:dialogTitle="@string/bluetooth_device_name"
- android:persistent="false"
- android:singleLine="true" />
-
- <CheckBoxPreference
- android:key="bt_discoverable"
- android:title="@string/bluetooth_visibility"
- android:summaryOn="@string/bluetooth_is_discoverable"
- android:summaryOff="@string/bluetooth_not_discoverable"
- android:persistent="false" />
-
- <ListPreference
- android:key="bt_discoverable_timeout"
- android:title="@string/bluetooth_visibility_timeout"
- android:summary="@string/bluetooth_visibility_timeout_summary"
- android:entries="@array/bluetooth_visibility_timeout_entries"
- android:entryValues="@array/bluetooth_visibility_timeout_values" />
-
- <Preference
- android:key="bt_show_received_files"
- android:title="@string/bluetooth_show_received_files_title"
- android:summary="@string/bluetooth_show_received_files_summary" />
-
-</PreferenceScreen>