Replaced Show Android Contacts setting with Contacts setting with possible

values 'baresip', 'Android', and Both

app/src/main/res/layout/activity_config.xml

@@ -215,37 +215,27 @@
             android:id="@+id/AudioSettingsTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="12dp"
             android:textSize="18sp"
             android:textStyle="bold"
             android:text="@string/audio_settings" >
         </TextView>
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/ContactsTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/contacts" >
+        </TextView>
+
+        <Spinner
+            android:id="@+id/contactsSpinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="12dp"
-            android:orientation="horizontal" >
-            <TextView
-                android:id="@+id/AndroidContactsTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_toStartOf="@id/AndroidContacts"
-                android:textSize="18sp"
-                android:text="@string/show_android_contacts" >
-            </TextView>
-            <CheckBox
-                android:id="@+id/AndroidContacts"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="end"
-                android:checked="false" >
-            </CheckBox>
-        </RelativeLayout>
+            android:paddingTop="8dp" >
+        </Spinner>
 
         <RelativeLayout
             android:layout_width="wrap_content"

app/src/main/res/layout/activity_main.xml

@@ -262,6 +262,7 @@
         android:src="@drawable/voicemail"
         android:layout_marginEnd="10dp"
         android:layout_marginBottom="5dp"
+        android:visibility="invisible"
         android:contentDescription="@string/voicemail" >
     </ImageButton>