Merge branch 'master' of https://github.com/WebBluetoothCG/ble-test-peripheral-android

Author: g-ortuno

README.md

@@ -3,6 +3,8 @@
 The BLE Peripheral Simulator is an Android app that allows developers to try
 out new features of Web Bluetooth without the need for a BLE Peripheral Device.
 
+You can build it from source or install it from the [Google Play Store](https://play.google.com/store/apps/details?id=io.github.webbluetoothcg.bletestperipheral).
+
 A developer can use the app to simulate a BLE Peripheral with one of two services:
 
 * Battery Service

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "io.github.webbluetoothcg.bletestperipheral"
         minSdkVersion 21
         targetSdkVersion 22
-        versionCode 2
-        versionName "2.0"
+        versionCode 3
+        versionName "3.0"
     }
     buildTypes {
         release {

app/src/main/java/io/github/webbluetoothcg/bletestperipheral/Peripheral.java

@@ -33,6 +33,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -171,11 +172,12 @@ public void onCharacteristicWriteRequest(BluetoothDevice device, int requestId,
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_peripherals);
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     mAdvStatus = (TextView) findViewById(R.id.textView_advertisingStatus);
     mConnectionStatus = (TextView) findViewById(R.id.textView_connectionStatus);
     mBluetoothDevices = new HashSet<>();
-    // TODO(g-ortuno): This can be moved to Peripherals.
-    ensureBleFeaturesAvailable();
+    mBluetoothManager = (BluetoothManager) getSystemService(Context.BLUETOOTH_SERVICE);
+    mBluetoothAdapter = mBluetoothManager.getAdapter();
 
     // If we are not being restored from a previous state then create and add the fragment.
     if (savedInstanceState == null) {
@@ -303,9 +305,6 @@ public void run() {
   ////// Bluetooth //////
   ///////////////////////
   private void ensureBleFeaturesAvailable() {
-    mBluetoothManager = (BluetoothManager) getSystemService(Context.BLUETOOTH_SERVICE);
-    mBluetoothAdapter = mBluetoothManager.getAdapter();
-
     if (mBluetoothAdapter == null) {
       Toast.makeText(this, R.string.bluetoothNotSupported, Toast.LENGTH_LONG).show();
       Log.e(TAG, "Bluetooth not supported");

app/src/main/res/values/strings.xml

@@ -27,7 +27,7 @@
 
     <!-- Adv -->
     <string name="label_advertisingStatus">Advertising Status</string>
-    <string name="status_advertising">Advertising</string>
+    <string name="status_advertising">Advertising (Keep Screen On)</string>
     <string name="status_notAdvertising">Not Advertising</string>
     <string name="status_advDataTooLarge">Not Advertising. Advertisement is larger than 31 bytes.</string>
     <string name="status_advFeatureUnsupported">Not Advertising. Advertising not supported.</string>