Merge "Bring back the Android Beam settings panel." into ics-factoryrom (0d299625) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -968,6 +968,19 @@
		</intent-filter>
		</activity>

		<!-- NFC settings -->
		<activity android:name="Settings$AndroidBeamSettingsActivity"
		android:label="@string/android_beam_settings_title"
		android:clearTaskOnLaunch="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<action android:name="android.settings.ANDROID_BEAM_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.nfc.NdefPush" />
		</activity>

		<!-- Accessibility tutorial -->
		<activity android:name="AccessibilityTutorialActivity"
		android:label="@string/accessibility_tutorial_title"

res/layout/android_beam.xml

0 → 100644

+49 −0

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.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:orientation="vertical"
		android:paddingLeft="6dip"
		android:paddingRight="6dip"
		android:layout_width="match_parent" android:layout_height="wrap_content"
		android:scrollbars="vertical" >

		<ScrollView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fillViewport="true">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<TextView android:id="@+id/android_beam_explained"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="20dip"
		android:gravity="top"
		android:text="@string/android_beam_explained"
		/>
		<ImageView android:id="@+id/android_beam_image"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		/>
		</LinearLayout>

		</ScrollView>

		</LinearLayout>

res/xml/wireless_settings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -36,8 +36,14 @@
		<CheckBoxPreference
		android:key="toggle_nfc"
		android:title="@string/nfc_quick_toggle_title"
		android:summary="@string/nfc_quick_toggle_summary"
		android:persistent="false" />

		<PreferenceScreen
		android:fragment="com.android.settings.nfc.AndroidBeam"
		android:key="android_beam_settings"
		android:title="@string/android_beam_settings_title" />

		<CheckBoxPreference
		android:key="toggle_wifi_p2p"
		android:title="@string/wifi_p2p_settings_title"

src/com/android/settings/Settings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -600,5 +600,5 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
		public static class DataUsageSummaryActivity extends Settings { /* empty */ }
		public static class AdvancedWifiSettingsActivity extends Settings { /* empty */ }
		public static class TextToSpeechSettingsActivity extends Settings { /* empty */ }
		public static class NfcSharingSettingsActivity extends Settings { /* empty */ }
		public static class AndroidBeamSettingsActivity extends Settings { /* empty */ }
		}

src/com/android/settings/WirelessSettings.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {

		private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
		private static final String KEY_TOGGLE_NFC = "toggle_nfc";
		private static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
		private static final String KEY_VPN_SETTINGS = "vpn_settings";
		private static final String KEY_TOGGLE_WIFI_P2P = "toggle_wifi_p2p";
		private static final String KEY_WIFI_P2P_SETTINGS = "wifi_p2p_settings";
		@@ -100,11 +101,12 @@ public class WirelessSettings extends SettingsPreferenceFragment {
		final Activity activity = getActivity();
		mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
		CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
		PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS);

		CheckBoxPreference wifiP2p = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI_P2P);

		mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
		mNfcEnabler = new NfcEnabler(activity, nfc);
		mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);

		String toggleable = Settings.System.getString(activity.getContentResolver(),
		Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
		@@ -122,12 +124,14 @@ public class WirelessSettings extends SettingsPreferenceFragment {
		// Manually set dependencies for NFC when not toggleable.
		if (toggleable == null \|\| !toggleable.contains(Settings.System.RADIO_NFC)) {
		findPreference(KEY_TOGGLE_NFC).setDependency(KEY_TOGGLE_AIRPLANE);
		findPreference(KEY_ANDROID_BEAM_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
		}

		// Remove NFC if its not available
		mNfcAdapter = NfcAdapter.getDefaultAdapter(activity);
		if (mNfcAdapter == null) {
		getPreferenceScreen().removePreference(nfc);
		getPreferenceScreen().removePreference(androidBeam);
		mNfcEnabler = null;
		}