X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FDeviceListActivity.java;h=1c3e1dbab21019bd9bfa82423e820a2129720c00;hb=ec46adee44ea08120b1940ca55a5fbdf56874bb1;hp=f36ef267c9c5c2660c5431e72638a388aa85125f;hpb=8b53f860eb3171cd43e4bd0e440f2889bd810662;p=fw%2Faltos diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java index f36ef267..1c3e1dba 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java @@ -17,7 +17,6 @@ package org.altusmetrum.AltosDroid; import java.util.Set; -import org.altusmetrum.AltosDroid.R; import android.app.Activity; import android.bluetooth.BluetoothAdapter; @@ -56,10 +55,10 @@ public class DeviceListActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { + setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]); super.onCreate(savedInstanceState); // Setup the window - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); setContentView(R.layout.device_list); // Set result CANCELED incase the user backs out @@ -136,7 +135,6 @@ public class DeviceListActivity extends Activity { AltosDebug.debug("doDiscovery()"); // Indicate scanning in the title - setProgressBarIndeterminateVisibility(true); setTitle(R.string.scanning); // Turn on sub-title for new devices @@ -208,7 +206,6 @@ public class DeviceListActivity extends Activity { /* When discovery is finished, change the Activity title */ } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) { - setProgressBarIndeterminateVisibility(false); setTitle(R.string.select_device); if (mNewDevicesArrayAdapter.getCount() == 0) { String noDevices = getResources().getText(R.string.none_found).toString();