diff --git a/res/layout/about.xml b/res/layout/about.xml
index 8ef477f60..cdd6e01c1 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -39,63 +39,120 @@
android:padding="15dp"/>
-
-
-
-
-
-
-
-
-
-
+
-
-
+ android:layout_marginTop="10dp"
+ android:layout_gravity="center"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ca2b2002e..79eb09055 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -8,8 +8,11 @@
Démarrage
%s enregistré
%s n\'a pas pu s\'enregistrer
- Linphone %s SIP (RFC 3261) sous licence GNU Public License V2
- http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2016 Belledonne Communications
+ Linphone Android %s
+ Linphone Core %s
+ GNU General Public License V2\n © 2010-2016 Belledonne Communications
+ www.linphone.org
+
org.linphone
contacts linphone
vnd.android.cursor.item/org.linphone.profile
@@ -122,11 +125,9 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.
Enregistrement échoué
messages non lus
-
- - Assistant
- - Paramètres
- - À Propos
-
+ Assistant
+ Paramètres
+ À Propos
Quitter
appel entrant
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fc2fc5058..aa8b535f3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,8 +9,10 @@
Starting up
%s registered
%s failed to register
- Linphone %s SIP (RFC 3261) compatible phone under GNU Public License V2
- http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2016 Belledonne Communications
+ Linphone Android %s
+ Linphone Core %s
+ GNU General Public License V2\n © 2010-2016 Belledonne Communications
+ www.linphone.org
linphone contacts
@@ -132,11 +134,9 @@
unread messages
-
- - Assistant
- - Settings
- - About
-
+ Assistant
+ Settings
+ About
Quit
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8fda0630a..97f52a5d5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -121,4 +121,17 @@
- 50sp
+
+
+
+
\ No newline at end of file
diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java
index a647db88b..764c32bf8 100644
--- a/src/org/linphone/AboutFragment.java
+++ b/src/org/linphone/AboutFragment.java
@@ -43,9 +43,11 @@ public class AboutFragment extends Fragment implements OnClickListener {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.about, container, false);
- TextView aboutText = (TextView) view.findViewById(R.id.about_text);
+ TextView aboutVersion = (TextView) view.findViewById(R.id.about_android_version);
+ TextView aboutLiblinphoneVersion = (TextView) view.findViewById(R.id.about_liblinphone_version);
+ aboutLiblinphoneVersion.setText(String.format(getString(R.string.about_liblinphone_version), LinphoneManager.getLc().getVersion()));
try {
- aboutText.setText(String.format(getString(R.string.about_text), getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName));
+ aboutVersion.setText(String.format(getString(R.string.about_version), getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName));
} catch (NameNotFoundException e) {
Log.e(e, "cannot get version name");
}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 108f0eb47..6b40500e2 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -655,14 +655,19 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
changeCurrentFragment(FragmentsAvailable.CHAT, extras);
}
} else {
- Bundle extras = new Bundle();
- extras.putString("SipUri", sipUri);
- if (lAddress.getDisplayName() != null) {
- extras.putString("DisplayName", displayName);
- extras.putString("PictureUri", pictureUri);
- extras.putString("ThumbnailUri", thumbnailUri);
+ if(isTablet()){
+ changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
+ displayChat(sipUri);
+ } else {
+ Bundle extras = new Bundle();
+ extras.putString("SipUri", sipUri);
+ if (lAddress.getDisplayName() != null) {
+ extras.putString("DisplayName", displayName);
+ extras.putString("PictureUri", pictureUri);
+ extras.putString("ThumbnailUri", thumbnailUri);
+ }
+ changeCurrentFragment(FragmentsAvailable.CHAT, extras);
}
- changeCurrentFragment(FragmentsAvailable.CHAT, extras);
}
if (messageListFragment != null && messageListFragment.isVisible()) {
@@ -1295,7 +1300,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
public void initSideMenu() {
sideMenu = (DrawerLayout) findViewById(R.id.side_menu);
- sideMenuItems = getResources().getStringArray(R.array.side_menu_item);
+ sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about)};
sideMenuContent = (RelativeLayout) findViewById(R.id.side_menu_content);
sideMenuItemList = (ListView)findViewById(R.id.item_list);
menu = (ImageView) findViewById(R.id.side_menu_button);
@@ -1304,13 +1309,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
sideMenuItemList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView> adapterView, View view, int i, long l) {
- if(sideMenuItemList.getAdapter().getItem(i).toString().equals("Settings")){
+ if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_settings))){
LinphoneActivity.instance().displaySettings();
}
- if(sideMenuItemList.getAdapter().getItem(i).toString().equals("About")){
+ if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_about))){
LinphoneActivity.instance().displayAbout();
}
- if(sideMenuItemList.getAdapter().getItem(i).toString().equals("Assistant")){
+ if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_assistant))){
LinphoneActivity.instance().displayAssistant();
}
openOrCloseSideMenu(false);