From 08d782ac0ef0fd337b3c2fe0f4727b1bf96e8d69 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Fri, 18 Oct 2013 09:36:35 -0400
Subject: [PATCH] * #31983: adjustements for 1.2.3.02
---
AndroidManifest.xml | 4 ++--
res/layout/dialog_codecs_list.xml | 3 ++-
res/layout/frag_accounts_list.xml | 1 +
res/layout/frag_call.xml | 1 -
src/org/sflphone/fragments/AccountCreationFragment.java | 2 +-
src/org/sflphone/service/SipService.java | 1 +
.../sflphone/views/dragsortlv/SimpleFloatViewManager.java | 7 +++----
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17d5a0620..e6d813b53 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 48833a3e3..5da964694 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 b8da1520f..568e56788 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 c5f5d7e3f..616fbf253 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 7a7eaa32b..2151dcf68 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 58b178365..db55abca5 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 17ffe7113..e605695a2 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
--
GitLab