am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread (bd34e568) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -251,7 +251,7 @@
		<string name="bluetooth_ask_discovery">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>

		<!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode -->
		<string name="bluetooth_ask_lasting_discovery">"An application on your phone is requesting permission to make your phone always discoverable by other Bluetooth devices. Do you want to do this?"</string>
		<string name="bluetooth_ask_lasting_discovery">"An application on your phone is requesting permission to make your phone \u201calways discoverable\u201d by other Bluetooth devices. Do you want to do this?"</string>

		<!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
		<string name="bluetooth_ask_enablement_and_discovery">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string>

src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -56,8 +56,6 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
		private static final String VALUE_DISCOVERABLE_TIMEOUT_ONE_HOUR = "onehour";
		private static final String VALUE_DISCOVERABLE_TIMEOUT_NEVER = "never";

		// no need for this timeout anymore since we have the listPreference default value
		// leaving now temporary until requestpermissionactivity is modified..
		static final int DEFAULT_DISCOVERABLE_TIMEOUT = DISCOVERABLE_TIMEOUT_TWO_MINUTES;

		private final Context mContext;

src/com/android/settings/bluetooth/RequestPermissionActivity.java

+5 −13

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public class RequestPermissionActivity extends Activity implements

		private static final String TAG = "RequestPermissionActivity";

		private static final int MAX_DISCOVERABLE_TIMEOUT = 300;
		private static final int MAX_DISCOVERABLE_TIMEOUT = 3600; // 1 hr

		// Non-error return code: BT is starting or has started successfully. Used
		// by this Activity and RequestPermissionHelperActivity
		@@ -158,13 +158,12 @@ public class RequestPermissionActivity extends Activity implements
		} else {
		// Ask the user whether to turn on discovery mode or not
		// For lasting discoverable mode there is a different message
		// TODO(): Revisit this when public APIs for discoverable timeout are introduced.
		if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
		builder.setMessage(
		getString(R.string.bluetooth_ask_enablement_and_lasting_discovery));
		getString(R.string.bluetooth_ask_lasting_discovery));
		} else {
		builder.setMessage(
		getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
		getString(R.string.bluetooth_ask_discovery, mTimeout));
		}
		builder.setPositiveButton(getString(R.string.yes), this);
		builder.setNegativeButton(getString(R.string.no), this);
		@@ -249,16 +248,9 @@ public class RequestPermissionActivity extends Activity implements
		mTimeout = intent.getIntExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION,
		BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT);

		Log.e(TAG, "Timeout = " + mTimeout);
		Log.d(TAG, "Setting Bluetooth Discoverable Timeout = " + mTimeout);

		// Right now assuming for simplicity that an app can pick any int value,
		// and if equal to BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER
		// it will be treated as a request for lasting discoverability.
		// Alternatively, a check can be added here for enforcing the specific allowed values
		// as listed in BluetoothDiscoverableEnabler.
		// We need to make all these value public.

		if (mTimeout <= 0) {
		if (mTimeout < 0 \|\| mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
		mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
		}
		} else {