PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BLE peripheral mode (4/4): Settings change for advertising preference.

Browse Source 
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
This commit is contained in:
Wei Wang
2013-11-19 01:32:10 -08:00
committed by Matthew Xie
parent fc8d255671
commit f4f8d9f346
17 changed files with 582 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
View File

@@ -30,7 +30,7 @@ import android.view.View;
import android.widget.TextView;
/**
* RequestPermissionHelperActivity asks the user whether to enable discovery.
* RequestPermissionHelperActivity asks the user whether to enable discovery or advertisement.
* This is usually started by RequestPermissionActivity.
*/
public class RequestPermissionHelperActivity extends AlertActivity implements
@@ -43,6 +43,9 @@ public class RequestPermissionHelperActivity extends AlertActivity implements
public static final String ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE =
"com.android.settings.bluetooth.ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE";
public static final String ACTION_INTERNAL_REQUEST_BT_ON_AND_START_ADVERTISE =
"com.android.settings.bluetooth.ACTION_INTERNAL_REQUEST_BT_ON_AND_ADVERTISE";
private LocalBluetoothAdapter mLocalAdapter;
private int mTimeout;
@@ -50,6 +53,7 @@ public class RequestPermissionHelperActivity extends AlertActivity implements
// True if requesting BT to be turned on
// False if requesting BT to be turned on + discoverable mode
private boolean mEnableOnly;
private boolean mDiscovery;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -75,12 +79,15 @@ public class RequestPermissionHelperActivity extends AlertActivity implements
if (mEnableOnly) {
p.mMessage = getString(R.string.bluetooth_ask_enablement);
} else {
} else if (mDiscovery) {
if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
p.mMessage = getString(R.string.bluetooth_ask_enablement_and_lasting_discovery);
} else {
p.mMessage = getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout);
}
} else {
p.mMessage = getString(R.string.bluetooth_ask_enablement_and_start_broadcast,
Utils.getCallingApp(this));
}
p.mPositiveButtonText = getString(R.string.allow);
@@ -138,9 +145,14 @@ public class RequestPermissionHelperActivity extends AlertActivity implements
} else if (intent != null
&& intent.getAction().equals(ACTION_INTERNAL_REQUEST_BT_ON_AND_DISCOVERABLE)) {
mEnableOnly = false;
mDiscovery = true;
// Value used for display purposes. Not range checking.
mTimeout = intent.getIntExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION,
BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT);
} else if (intent != null
&& intent.getAction().equals(ACTION_INTERNAL_REQUEST_BT_ON_AND_START_ADVERTISE)) {
mEnableOnly = false;
mDiscovery = false;
} else {
setResult(RESULT_CANCELED);
return true;