Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'public/master' into bellesip

Browse source 
Conflicts:
	submodules/linphone
This commit is contained in:
Jehan Monnier 2013-04-10 14:28:12 +02:00
commit 50b490861d
7 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/layout-small/incall.xml
View file

@ -47,11 +47,10 @@
android:id="@+id/numpad"
android:background="@drawable/dialer_alt_background"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_centerHorizontal="true"
android:layout_below="@id/switchCamera"
android:layout_marginBottom="150dp" />
android:layout_centerVertical="true" />
<LinearLayout
android:id="@+id/menu"

28
res/layout/history_cell_simple.xml
View file

@ -2,8 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="@drawable/list_selector"
android:gravity="center_vertical"
android:orientation="vertical" >
<TextView
@ -47,28 +47,28 @@
android:textColor="@android:color/black"
android:layout_marginLeft="10dp" />
<ImageView
android:contentDescription="@string/content_description_detail"
<ImageView
android:id="@+id/detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:layout_height="match_parent"
android:layout_weight="0.9"
android:src="@drawable/list_detail"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
android:adjustViewBounds="true"
android:contentDescription="@string/content_description_detail"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:src="@drawable/list_detail" />
<ImageView
android:contentDescription="@string/content_description_delete"
<ImageView
android:id="@+id/delete"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:layout_weight="0.9"
android:visibility="gone"
android:adjustViewBounds="true"
android:contentDescription="@string/content_description_delete"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:src="@drawable/list_delete"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
android:visibility="gone" />
</LinearLayout>

5
res/layout/incall.xml
View file

@ -47,11 +47,10 @@
android:id="@+id/numpad"
android:background="@drawable/dialer_alt_background"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_centerHorizontal="true"
android:layout_below="@id/switchCamera"
android:layout_marginBottom="150dp" />
android:layout_centerVertical="true"/>
<LinearLayout
android:id="@+id/menu"

3
src/org/linphone/ChatFragment.java
View file

@ -324,7 +324,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
@Override
public void run() {
//Scroll to latest saw message
messagesScrollView.scrollTo(0, messagesLayout.getChildAt(MESSAGES_STEP-1).getBottom());
if (messagesScrollView != null && messagesLayout != null && messagesLayout.getChildCount() >= MESSAGES_STEP-1)
messagesScrollView.scrollTo(0, messagesLayout.getChildAt(MESSAGES_STEP-1).getBottom());
}
}, 300);
}

5
src/org/linphone/LinphoneActivity.java
View file

@ -232,12 +232,12 @@ public class LinphoneActivity extends FragmentActivity implements
return;
}
findViewById(R.id.status).setVisibility(View.VISIBLE);
if (statusFragment != null && !statusFragment.isVisible()) {
// Hack to ensure statusFragment is visible after coming back to
// dialer from chat
statusFragment.getView().setVisibility(View.VISIBLE);
}
findViewById(R.id.status).setVisibility(View.VISIBLE);
findViewById(R.id.fragmentContainer).setPadding(0, LinphoneUtils.pixelsToDpi(getResources(), 40), 0, 0);
}
@ -1384,6 +1384,9 @@ public class LinphoneActivity extends FragmentActivity implements
showStatusBar();
reloadConfig();
updateAnimationsState();
} else if (currentFragment == FragmentsAvailable.CHATLIST) {
//Hack to ensure display the status bar on some devices
showStatusBar();
}
}
} else if (keyCode == KeyEvent.KEYCODE_MENU && statusFragment != null) {

2
submodules/msilbc

@ -1 +1 @@
Subproject commit 32a39741b64d74999134f5e6425609c4cfff5daf
Subproject commit f9f77d4fe04cd51aa3ca4b3b35ac51667c48139e

2
submodules/mssilk

@ -1 +1 @@
Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40
Subproject commit f21cf1f038496c14c66f2387df9542c5f5e28cf1