i18n: add RTL support
Change-Id: I725a98f5a2c7759cb1d04ba0e7b51178fc1118b2
diff --git a/ring-android/app/src/main/AndroidManifest.xml b/ring-android/app/src/main/AndroidManifest.xml
index 951df2d..ed2e77c 100644
--- a/ring-android/app/src/main/AndroidManifest.xml
+++ b/ring-android/app/src/main/AndroidManifest.xml
@@ -77,6 +77,7 @@
<application
android:allowBackup="true"
+ android:supportsRtl="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
<activity
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
index 6a2ab31..e8bb56a 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/AccountSelectionAdapter.java
@@ -83,7 +83,7 @@
if (rowView == null) {
LayoutInflater inflater = LayoutInflater.from(mContext);
- rowView = inflater.inflate(R.layout.item_account_selected, null);
+ rowView = inflater.inflate(R.layout.item_account_selected, parent, false);
entryView = new AccountView();
entryView.alias = (TextView) rowView.findViewById(R.id.account_alias);
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
index 54aa435..1597065 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/ContactsAdapter.java
@@ -101,7 +101,7 @@
ContactView entryView;
if (convertView == null) {
- convertView = mInflater.inflate(R.layout.item_contact, null);
+ convertView = mInflater.inflate(R.layout.item_contact, root, false);
entryView = new ContactView();
/*entryView.quick_starred = (ImageButton) convertView.findViewById(R.id.quick_starred);
diff --git a/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
index 06fdc9a..39afc2b 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/StarredContactsAdapter.java
@@ -1,7 +1,8 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.adapters;
@@ -87,7 +77,7 @@
LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
if (v == null) {
- v = inflater.inflate(R.layout.item_contact_starred, null);
+ v = inflater.inflate(R.layout.item_contact_starred, parent, false);
}
CallContact item = dataset.get(pos);
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
index ad12dea..a5fefd4 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AccountsManagementFragment.java
@@ -260,7 +260,7 @@
if (rowView == null) {
LayoutInflater inflater = LayoutInflater.from(mContext);
- rowView = inflater.inflate(R.layout.item_account_pref, null);
+ rowView = inflater.inflate(R.layout.item_account_pref, parent, false);
entryView = new AccountView();
entryView.handle = (ImageView) rowView.findViewById(R.id.drag_handle);
@@ -282,6 +282,7 @@
if (item.isIP2IP()) {
entryView.host.setText(item.getRegistered_state());
entryView.enabled.setVisibility(View.GONE);
+ entryView.enabled.setChecked(item.isEnabled());
entryView.handle.setVisibility(View.INVISIBLE);
} else {
if (item.isSip())
@@ -301,6 +302,7 @@
}
}
});
+ entryView.handle.setVisibility(View.VISIBLE);
}
if (item.isEnabled()) {
if (item.isTrying()) {
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
index 68e9f11..a9d4700 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AudioManagementFragment.java
@@ -1,8 +1,9 @@
/*
- * Copyright (C) 2004-2014 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+ * Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,17 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Additional permission under GNU GPL version 3 section 7:
- *
- * If you modify this program, or any covered work, by linking or
- * combining it with the OpenSSL project's OpenSSL library (or a
- * modified version of that library), containing parts covered by the
- * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
- * grants you additional permission to convey the resulting work.
- * Corresponding Source for a non-source form of such a combination
- * shall include the source code for the parts of OpenSSL used as well
- * as that of the covered work.
*/
package cx.ring.fragments;
@@ -71,9 +61,10 @@
static final String TAG = AudioManagementFragment.class.getSimpleName();
protected Callbacks mCallbacks = sDummyCallbacks;
- ArrayList<Codec> codecs;
+ private ArrayList<Codec> codecs;
private DragSortListView mCodecList;
- CodecAdapter listAdapter;
+ private CodecAdapter listAdapter;
+
private static final Callbacks sDummyCallbacks = new Callbacks() {
@Override
public IDRingService getRemoteService() {
@@ -104,7 +95,7 @@
try {
codecs = (ArrayList<Codec>) mCallbacks.getRemoteService().getCodecList(mCallbacks.getAccount().getAccountID());
//mCallbacks.getService().getRingtoneList();
- } catch (RemoteException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -364,7 +355,7 @@
if (rowView == null) {
LayoutInflater inflater = LayoutInflater.from(mContext);
- rowView = inflater.inflate(R.layout.item_codec, null);
+ rowView = inflater.inflate(R.layout.item_codec, parent, false);
entryView = new CodecView();
entryView.name = (TextView) rowView.findViewById(R.id.codec_name);
@@ -387,7 +378,6 @@
entryView.enabled.setChecked(codec.isEnabled());
return rowView;
-
}
@Override
diff --git a/ring-android/app/src/main/res/layout/activity_home.xml b/ring-android/app/src/main/res/layout/activity_home.xml
index a70b7e8..fb90ccf 100644
--- a/ring-android/app/src/main/res/layout/activity_home.xml
+++ b/ring-android/app/src/main/res/layout/activity_home.xml
@@ -75,7 +75,7 @@
app:fabSize="mini"
app:pressedTranslationZ="12dp"
app:rippleColor="@android:color/white"
- android:layout_marginStart="@dimen/action_button_bpadding"
+ android:layout_marginStart="@dimen/action_button_lpadding"
android:visibility="gone" />
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_contact_list_header.xml b/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
index f9e5aa4..42696c5 100644
--- a/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
+++ b/ring-android/app/src/main/res/layout/frag_contact_list_header.xml
@@ -19,6 +19,7 @@
android:background="@android:color/white"
android:gravity="center_vertical"
android:paddingLeft="16dp"
+ android:paddingRight="16dp"
android:text="@string/starred_contacts_title"
android:textColor="@color/text_color_secondary"
android:textSize="16sp"
diff --git a/ring-android/app/src/main/res/layout/header.xml b/ring-android/app/src/main/res/layout/header.xml
index 36fc52c..d8814ff 100644
--- a/ring-android/app/src/main/res/layout/header.xml
+++ b/ring-android/app/src/main/res/layout/header.xml
@@ -19,7 +19,9 @@
android:textStyle="bold"
android:layout_marginLeft="16dp"
android:text="A"
- android:layout_gravity="center_vertical" />
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="16dp"
+ android:textAlignment="viewStart" />
<ImageView
android:layout_width="fill_parent"
diff --git a/ring-android/app/src/main/res/layout/item_account.xml b/ring-android/app/src/main/res/layout/item_account.xml
index d6a9020..f373caa 100644
--- a/ring-android/app/src/main/res/layout/item_account.xml
+++ b/ring-android/app/src/main/res/layout/item_account.xml
@@ -8,35 +8,38 @@
android:id="@+id/account_alias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentLeft="false"
+ android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:textAppearance="@style/ListPrimary"
- android:text="Account name" />
+ android:text="Account name"
+ android:textAppearance="@style/ListPrimary" />
<TextView
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentLeft="false"
+ android:layout_alignParentStart="true"
android:layout_below="@+id/account_alias"
- android:textAppearance="@style/ListSecondary"
- android:text="hostnamehostnamehostnamehostnamehostnamehostnamehostnamehostname"
+ android:layout_toLeftOf="@+id/error_indicator"
+ android:layout_toStartOf="@+id/error_indicator"
android:ellipsize="middle"
android:singleLine="true"
- android:layout_toLeftOf="@+id/error_indicator"
- android:layout_toStartOf="@+id/error_indicator" />
+ android:text="hostnamehostnamehostnamehostnamehostnamehostnamehostnamehostname"
+ android:textAppearance="@style/ListSecondary" />
<ImageView
android:id="@+id/error_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="false"
android:layout_centerVertical="true"
+ android:layout_marginStart="16dp"
android:clickable="false"
android:focusable="false"
- android:src="@drawable/ic_error_white_24dp"
android:focusableInTouchMode="false"
- android:tint="@android:color/holo_red_light"
- android:layout_marginLeft="16dp" />
+ android:src="@drawable/ic_error_white_24dp"
+ android:tint="@android:color/holo_red_light" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_account_pref.xml b/ring-android/app/src/main/res/layout/item_account_pref.xml
index a34d7cc..84ff187 100644
--- a/ring-android/app/src/main/res/layout/item_account_pref.xml
+++ b/ring-android/app/src/main/res/layout/item_account_pref.xml
@@ -6,69 +6,81 @@
android:minHeight="72dp">
<ImageView
- android:id="@+id/drag_handle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:layout_marginLeft="16dp"
- android:src="@drawable/ic_reorder_black_24dp"/>
+ android:id="@+id/drag_handle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="16dp"
+ android:src="@drawable/ic_reorder_black_24dp"
+ android:layout_marginLeft="16dp" />
<TextView
android:id="@+id/account_alias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_marginLeft="72dp"
+ android:layout_marginStart="72dp"
+ android:layout_marginTop="16dp"
android:text="Acount name"
android:textAppearance="@style/ListPrimary"
- android:layout_alignParentLeft="true"
- android:layout_marginTop="16dp" />
+ android:layout_toStartOf="@id/error_indicator"
+ android:textAlignment="viewStart"
+ android:focusable="false"
+ android:layout_marginLeft="72dp" />
<TextView
android:id="@+id/account_host"
- android:layout_width="fill_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/account_alias"
- android:layout_marginLeft="72dp"
- android:textAppearance="@style/ListSecondary"
- android:text="hostnamehostnamehostnamehostnamehostname"
android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/account_alias"
+ android:layout_marginStart="72dp"
android:ellipsize="middle"
android:singleLine="true"
- android:layout_toLeftOf="@+id/error_indicator"
- android:layout_toStartOf="@+id/error_indicator" />
-
- <CheckBox
- android:id="@+id/account_checked"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_marginRight="16dp"
- android:focusable="false"
- android:layout_centerVertical="true" />
-
- <ProgressBar
- style="?android:attr/progressBarStyleSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/loading_indicator"
- android:layout_marginRight="16dp"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/account_checked" />
+ android:text="ready"
+ android:textAppearance="@style/ListSecondary"
+ android:layout_marginLeft="72dp"
+ android:layout_toStartOf="@id/error_indicator"
+ android:textAlignment="viewStart"
+ android:focusable="false" />
<ImageView
android:id="@+id/error_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_margin="16dp"
+ android:layout_toStartOf="@+id/account_checked"
android:clickable="false"
android:focusable="false"
- android:src="@drawable/ic_error_white_24dp"
android:focusableInTouchMode="false"
- android:layout_centerVertical="true"
- android:layout_toStartOf="@+id/account_checked"
- android:layout_toLeftOf="@+id/loading_indicator"
+ android:src="@drawable/ic_error_white_24dp"
android:tint="@color/error_red"
- android:layout_margin="16dp" />
+ android:visibility="gone" />
+
+ <ProgressBar
+ android:id="@+id/loading_indicator"
+ style="?android:attr/progressBarStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="16dp"
+ android:layout_toStartOf="@+id/account_checked"
+ android:visibility="gone" />
+
+ <CheckBox
+ android:id="@+id/account_checked"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"
+ android:layout_margin="16dp"
+ android:focusable="false" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_account_selected.xml b/ring-android/app/src/main/res/layout/item_account_selected.xml
index 6abbe19..880ddab 100644
--- a/ring-android/app/src/main/res/layout/item_account_selected.xml
+++ b/ring-android/app/src/main/res/layout/item_account_selected.xml
@@ -2,44 +2,46 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="72dp"
- android:paddingTop="16dp"
- android:paddingRight="16dp"
android:minHeight="72dp"
- android:paddingBottom="16dp">
+ android:paddingBottom="16dp"
+ android:paddingRight="16dp"
+ android:paddingStart="16dp"
+ android:paddingTop="16dp">
<TextView
android:id="@+id/account_alias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentLeft="false"
+ android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/white"
- android:text="Account name" />
+ android:textColor="@color/white" />
<TextView
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentLeft="false"
+ android:layout_alignParentStart="true"
android:layout_below="@+id/account_alias"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/secondary_text_default_material_dark"
- android:text="hostnamehostnamehostnamehostnamehostnamehostnamehostname"
- android:singleLine="true"
- android:ellipsize="middle"
android:layout_toLeftOf="@+id/error_indicator"
- android:layout_toStartOf="@+id/error_indicator" />
+ android:layout_toStartOf="@+id/error_indicator"
+ android:ellipsize="middle"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/secondary_text_default_material_dark" />
<ImageView
android:id="@+id/error_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="false"
android:layout_centerVertical="true"
+ android:layout_marginStart="16dp"
android:clickable="false"
android:focusable="false"
- android:src="@drawable/ic_error_white_24dp"
- android:layout_marginLeft="16dp" />
+ android:src="@drawable/ic_error_white_24dp" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_calllist.xml b/ring-android/app/src/main/res/layout/item_calllist.xml
index 40483b6..6eb5eba 100644
--- a/ring-android/app/src/main/res/layout/item_calllist.xml
+++ b/ring-android/app/src/main/res/layout/item_calllist.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2004-2015 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -20,7 +19,6 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/call_entry"
android:layout_width="match_parent"
android:layout_height="72dp"
@@ -31,51 +29,54 @@
android:id="@+id/photo"
android:layout_width="40dp"
android:layout_height="40dp"
- android:background="@null"
- android:scaleType="centerCrop"
- android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_marginRight="16dp" />
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="16dp"
+ android:layout_marginRight="16dp"
+ android:background="@null"
+ android:scaleType="centerCrop"
+ android:src="@drawable/ic_contact_picture" />
<TextView
android:id="@+id/conv_participant"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="false"
android:layout_alignParentTop="true"
+ android:layout_marginTop="2dp"
+ android:layout_toEndOf="@+id/photo"
+ android:layout_toLeftOf="@+id/conv_last_time"
+ android:layout_toRightOf="@+id/photo"
+ android:layout_toStartOf="@+id/conv_last_time"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
- android:textSize="16sp"
- android:layout_toRightOf="@+id/photo"
+ android:textAlignment="viewStart"
android:textColor="@color/text_color_primary"
- android:layout_marginTop="2dp"
- android:layout_toLeftOf="@+id/conv_last_time"
- android:layout_toStartOf="@+id/conv_last_time" />
+ android:textSize="16sp" />
<TextView
android:id="@+id/conv_last_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="false"
- android:layout_below="@+id/conv_participant"
- android:textSize="14sp"
- android:layout_toRightOf="@+id/photo"
- android:textColor="@color/text_color_secondary"
- android:layout_toStartOf="@+id/conv_last_time"
+ android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true" />
+ android:layout_below="@+id/conv_participant"
+ android:layout_toEndOf="@+id/photo"
+ android:layout_toRightOf="@+id/photo"
+ android:textAlignment="viewStart"
+ android:textColor="@color/text_color_secondary"
+ android:textSize="14sp" />
<TextView
android:id="@+id/conv_last_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="12sp"
- android:textColor="@color/text_color_secondary"
- android:layout_alignParentRight="true"
+ android:layout_alignBaseline="@+id/conv_participant"
android:layout_alignParentEnd="true"
- android:layout_alignBaseline="@+id/conv_participant" />
+ android:layout_alignParentRight="true"
+ android:textColor="@color/text_color_secondary"
+ android:textSize="12sp" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_codec.xml b/ring-android/app/src/main/res/layout/item_codec.xml
index 8488463..307ac0f 100644
--- a/ring-android/app/src/main/res/layout/item_codec.xml
+++ b/ring-android/app/src/main/res/layout/item_codec.xml
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2015 Savoir-faire Linux Inc.
+
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/codec_container"
@@ -13,7 +32,8 @@
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="16dp"
- android:src="@drawable/ic_reorder_black_24dp"/>
+ android:src="@drawable/ic_reorder_black_24dp"
+ android:layout_alignParentStart="true" />
<TextView
android:id="@+id/codec_name"
@@ -24,7 +44,8 @@
android:gravity="center_vertical"
android:textSize="16sp"
android:textColor="@color/text_color_primary"
- android:text="H.264" />
+ android:text="H.264"
+ android:layout_toEndOf="@id/drag_handle" />
<TextView
android:id="@+id/codec_samplerate"
@@ -37,7 +58,8 @@
android:text="32000"
android:textColor="@color/text_color_secondary"
android:layout_marginLeft="16dp"
- android:layout_alignBaseline="@+id/codec_name" />
+ android:layout_alignBaseline="@+id/codec_name"
+ android:layout_toEndOf="@id/codec_name" />
<CheckBox
android:id="@+id/codec_checked"
@@ -48,6 +70,7 @@
android:clickable="false"
android:focusable="false"
android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp" />
+ android:layout_marginRight="16dp"
+ android:layout_alignParentEnd="true" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml
index 7d8b9b4..16ccf21 100644
--- a/ring-android/app/src/main/res/layout/item_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_contact.xml
@@ -33,27 +33,27 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:contentDescription="@string/contact_picture_description"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop"
+ android:layout_alignParentStart="true" />
<TextView
android:id="@+id/display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_toRightOf="@+id/photo"
android:gravity="center_vertical"
android:textColor="@color/text_color_primary"
android:textIsSelectable="false"
android:textSize="16sp"
- android:layout_toLeftOf="@+id/quick_call"
- android:layout_toStartOf="@+id/quick_call" />
+ android:layout_toEndOf="@+id/photo"
+ android:layout_toStartOf="@+id/quick_call"
+ android:textAlignment="viewStart" />
<ImageButton
android:id="@+id/quick_call"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@null"
android:contentDescription="@string/contact_quick_call_description"
diff --git a/ring-android/app/src/main/res/layout/item_menu_header.xml b/ring-android/app/src/main/res/layout/item_menu_header.xml
deleted file mode 100644
index 0249b9d..0000000
--- a/ring-android/app/src/main/res/layout/item_menu_header.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/list_header_title"
- style="?android:attr/listSeparatorTextViewStyle"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="2dip"
- android:textColor="@color/black"
- android:paddingLeft="5dip"
- android:paddingTop="2dip" />
diff --git a/ring-android/app/src/main/res/layout/item_textmsg.xml b/ring-android/app/src/main/res/layout/item_textmsg.xml
index 07560c1..f68d1d7 100644
--- a/ring-android/app/src/main/res/layout/item_textmsg.xml
+++ b/ring-android/app/src/main/res/layout/item_textmsg.xml
@@ -19,7 +19,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="wrap_content"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content">
<RelativeLayout
@@ -29,11 +29,13 @@
android:background="@android:color/transparent"
android:focusable="false"
android:layout_gravity="right"
- android:visibility="gone"
android:paddingRight="@dimen/padding_large"
+ android:paddingEnd="@dimen/padding_large"
android:paddingLeft="@dimen/padding_large"
+ android:paddingStart="@dimen/padding_large"
android:paddingTop="4dp"
- android:paddingBottom="4dp">
+ android:paddingBottom="4dp"
+ android:visibility="gone">
<TextView
android:id="@+id/msg_txt_right"
@@ -45,7 +47,6 @@
android:padding="12dp"
android:scrollHorizontally="true"
android:singleLine="false"
- android:text="Ceci est un long message sur plusieurs lignes. Il apparaitera en multilignes"
android:textColor="@color/text_color_primary"
android:textSize="16sp"
android:focusable="true"
@@ -53,13 +54,13 @@
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:layout_marginLeft="48dp" />
+ android:layout_marginLeft="48dp"
+ android:layout_marginStart="48dp"/>
<TextView
android:id="@+id/msg_details_txt_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Adrien - 12 mars"
android:textColor="@color/text_color_secondary"
android:textSize="14sp"
android:layout_below="@+id/msg_txt_right"
@@ -70,15 +71,17 @@
<RelativeLayout
android:id="@+id/txt_entry"
- android:layout_width="match_parent"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:focusable="false"
- android:visibility="gone"
android:paddingTop="4dp"
android:paddingBottom="4dp"
+ android:paddingRight="@dimen/padding_large"
+ android:paddingEnd="@dimen/padding_large"
android:paddingLeft="@dimen/padding_large"
- android:paddingRight="@dimen/padding_large">
+ android:paddingStart="@dimen/padding_large"
+ android:visibility="gone">
<ImageView
android:id="@+id/photo"
@@ -88,6 +91,7 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginRight="16dp"
+ android:layout_marginEnd="16dp"
android:background="@null"
android:scaleType="centerCrop" />
@@ -104,24 +108,23 @@
android:padding="12dp"
android:scrollHorizontally="true"
android:singleLine="false"
- android:text="Ceci est un message"
android:textColor="@color/text_color_primary"
android:textSize="16sp"
android:focusable="true"
android:textIsSelectable="true"
- android:layout_marginRight="48dp" />
+ android:layout_marginRight="48dp"
+ android:layout_marginEnd="48dp"/>
<TextView
android:id="@+id/msg_details_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="false"
android:layout_below="@+id/msg_txt"
android:layout_toRightOf="@+id/photo"
- android:text="Adrien - 12 mars"
android:textColor="@color/text_color_secondary"
android:textSize="14sp"
- android:layout_marginBottom="8dp" />
+ android:layout_marginBottom="8dp"
+ android:layout_toEndOf="@id/photo" />
</RelativeLayout>
@@ -135,8 +138,8 @@
android:padding="12dp"
android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom"
- android:visibility="visible"
- android:layout_marginTop="8dp">
+ android:layout_marginTop="8dp"
+ android:visibility="visible">
<TextView
android:id="@+id/call_hist_txt"