diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 17d5a0620fb63a461e3da1cf6f6bea444a861ffa..e6d813b536f423e427520d53a5ada89565fee189 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -32,8 +32,8 @@ as that of the covered work. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.sflphone" - android:versionCode="4" - android:versionName="1.2.3.01" > + android:versionCode="5" + android:versionName="1.2.3.02" > <uses-sdk android:minSdkVersion="14" diff --git a/res/layout/dialog_codecs_list.xml b/res/layout/dialog_codecs_list.xml index 48833a3e36cb0c9393891fe9d09ecd05f37ec120..5da96469401990ef8ae3c41e64dfe71ac8817171 100644 --- a/res/layout/dialog_codecs_list.xml +++ b/res/layout/dialog_codecs_list.xml @@ -6,6 +6,7 @@ android:layout_height="match_parent" android:layout_margin="3dp" android:choiceMode="multipleChoice" + android:descendantFocusability="beforeDescendants" android:dividerHeight="1px" android:padding="3dp" dslv:collapsed_height="1px" @@ -13,7 +14,7 @@ dslv:drag_handle_id="@id/drag_handle" dslv:drag_scroll_start="0.33" dslv:drag_start_mode="onLongPress" - android:descendantFocusability="beforeDescendants" dslv:float_alpha="0.6" + dslv:float_background_color="@color/sfl_action_blue" dslv:remove_enabled="false" dslv:slide_shuffle_speed="0.3" /> diff --git a/res/layout/frag_accounts_list.xml b/res/layout/frag_accounts_list.xml index b8da1520fe96e041e81572e0cd8caf4af8af1562..568e567887b562e8551614932a2766d23d9655a1 100644 --- a/res/layout/frag_accounts_list.xml +++ b/res/layout/frag_accounts_list.xml @@ -16,6 +16,7 @@ dslv:collapsed_height="1px" dslv:drag_enabled="true" dslv:drag_handle_id="@id/drag_handle" + dslv:float_background_color="@color/sfl_action_blue" dslv:drag_scroll_start="0.33" dslv:drag_start_mode="onLongPress" dslv:float_alpha="0.6" diff --git a/res/layout/frag_call.xml b/res/layout/frag_call.xml index c5f5d7e3f2a0ce0ff0d17e6dd38bcb9674e2a0b4..616fbf2530578ed231822fbb846326aab9947b99 100644 --- a/res/layout/frag_call.xml +++ b/res/layout/frag_call.xml @@ -5,7 +5,6 @@ android:background="@color/sfl_light_blue" android:divider="@drawable/divider" android:orientation="vertical" - android:paddingTop="?android:attr/actionBarSize" android:showDividers="middle" > <RelativeLayout diff --git a/src/org/sflphone/fragments/AccountCreationFragment.java b/src/org/sflphone/fragments/AccountCreationFragment.java index 7a7eaa32bc7d13891a7b7d783eb219888e987621..2151dcf685562b433b6600e015161dd1fe601c85 100644 --- a/src/org/sflphone/fragments/AccountCreationFragment.java +++ b/src/org/sflphone/fragments/AccountCreationFragment.java @@ -96,7 +96,7 @@ public class AccountCreationFragment extends Fragment { } }); - // inflatedView.findViewById(R.id.dev_account).setVisibility(View.GONE); // Hide this button in release apk + inflatedView.findViewById(R.id.dev_account).setVisibility(View.GONE); // Hide this button in release apk inflatedView.findViewById(R.id.dev_account).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/src/org/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java index 58b1783657d6d00b025565a339ed01c57509083f..db55abca5991c684b43dff7c05975a0037766703 100644 --- a/src/org/sflphone/service/SipService.java +++ b/src/org/sflphone/service/SipService.java @@ -264,6 +264,7 @@ public class SipService extends Service { Log.i(TAG, "->startPjSipStack"); + } public HashMap<String, SipCall> getCurrent_calls() { diff --git a/src/org/sflphone/views/dragsortlv/SimpleFloatViewManager.java b/src/org/sflphone/views/dragsortlv/SimpleFloatViewManager.java index 17ffe71132341c088a9c52761fe65135c8851cd4..e605695a2641b23d095f9b4b02a2564c7f43e103 100644 --- a/src/org/sflphone/views/dragsortlv/SimpleFloatViewManager.java +++ b/src/org/sflphone/views/dragsortlv/SimpleFloatViewManager.java @@ -1,13 +1,12 @@ package org.sflphone.views.dragsortlv; import android.graphics.Bitmap; -import android.graphics.Point; import android.graphics.Color; -import android.widget.ListView; -import android.widget.ImageView; +import android.graphics.Point; import android.view.View; import android.view.ViewGroup; -import android.util.Log; +import android.widget.ImageView; +import android.widget.ListView; /** * Simple implementation of the FloatViewManager class. Uses list