Fix layouts errors and warnings
VectorDrawables could make the app crash or could be badly rendered
under particular circumstances
Change-Id: Id944358ad984e719750ea72e2a01b7b569876d49
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 339be15..6f57f07 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -44,6 +44,7 @@
defaultConfig {
minSdkVersion 18
targetSdkVersion 26
+ vectorDrawables.useSupportLibrary = true
}
sourceSets {
diff --git a/ring-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.java b/ring-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.java
index 95f116f..a5c507c 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/camera/CustomCameraActivity.java
@@ -66,7 +66,7 @@
ButterKnife.bind(this);
mCamera = getCameraInstance();
mCameraPreview = new CameraPreview(this, mCamera);
- FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview);
+ FrameLayout preview = findViewById(R.id.camera_preview);
preview.addView(mCameraPreview);
}
diff --git a/ring-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java b/ring-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java
index 8c5ea1e..6ca4ed1 100644
--- a/ring-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java
+++ b/ring-android/app/src/main/java/cx/ring/views/BoundedLinearLayout.java
@@ -38,9 +38,9 @@
public BoundedLinearLayout(Context context, AttributeSet attrs) {
super(context, attrs);
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BoundedView);
- mBoundedWidth = a.getDimensionPixelSize(R.styleable.BoundedView_bounded_width, 0);
- mBoundedHeight = a.getDimensionPixelSize(R.styleable.BoundedView_bounded_height, 0);
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BoundedScrollView);
+ mBoundedWidth = a.getDimensionPixelSize(R.styleable.BoundedScrollView_bounded_width, 0);
+ mBoundedHeight = a.getDimensionPixelSize(R.styleable.BoundedScrollView_bounded_height, 0);
a.recycle();
}
diff --git a/ring-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java b/ring-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java
index 53e21c7..895b673 100644
--- a/ring-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java
+++ b/ring-android/app/src/main/java/cx/ring/views/BoundedRelativeLayout.java
@@ -38,9 +38,9 @@
public BoundedRelativeLayout(Context context, AttributeSet attrs) {
super(context, attrs);
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BoundedView);
- mBoundedWidth = a.getDimensionPixelSize(R.styleable.BoundedView_bounded_width, 0);
- mBoundedHeight = a.getDimensionPixelSize(R.styleable.BoundedView_bounded_height, 0);
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BoundedScrollView);
+ mBoundedWidth = a.getDimensionPixelSize(R.styleable.BoundedScrollView_bounded_width, 0);
+ mBoundedHeight = a.getDimensionPixelSize(R.styleable.BoundedScrollView_bounded_height, 0);
a.recycle();
}
diff --git a/ring-android/app/src/main/java/cx/ring/views/BoundedScrollView.java b/ring-android/app/src/main/java/cx/ring/views/BoundedScrollView.java
index 28c945c..aa0bf50 100644
--- a/ring-android/app/src/main/java/cx/ring/views/BoundedScrollView.java
+++ b/ring-android/app/src/main/java/cx/ring/views/BoundedScrollView.java
@@ -38,9 +38,9 @@
public BoundedScrollView(Context context, AttributeSet attrs) {
super(context, attrs);
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BoundedView);
- mBoundedWidth = a.getDimensionPixelSize(R.styleable.BoundedView_bounded_width, 0);
- mBoundedHeight = a.getDimensionPixelSize(R.styleable.BoundedView_bounded_height, 0);
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BoundedScrollView);
+ mBoundedWidth = a.getDimensionPixelSize(R.styleable.BoundedScrollView_bounded_width, 0);
+ mBoundedHeight = a.getDimensionPixelSize(R.styleable.BoundedScrollView_bounded_height, 0);
a.recycle();
}
diff --git a/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java b/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java
index c0f4ff1..212ce52 100644
--- a/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java
+++ b/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java
@@ -39,14 +39,14 @@
public ConversationViewHolder(ViewGroup v, int type) {
super(v);
if (type == ConversationAdapter.ConversationMessageType.CALL_INFORMATION_TEXT_MESSAGE.getType()) {
- mHistTxt = (TextView) v.findViewById(R.id.call_hist_txt);
- mHistDetailTxt = (TextView) v.findViewById(R.id.call_details_txt);
- mPhoto = (ImageView) v.findViewById(R.id.call_icon);
+ mHistTxt = v.findViewById(R.id.call_hist_txt);
+ mHistDetailTxt = v.findViewById(R.id.call_details_txt);
+ mPhoto = v.findViewById(R.id.call_icon);
} else {
- mMsgTxt = (TextView) v.findViewById(R.id.msg_txt);
- mMsgDetailTxt = (TextView) v.findViewById(R.id.msg_details_txt);
+ mMsgTxt = v.findViewById(R.id.msg_txt);
+ mMsgDetailTxt = v.findViewById(R.id.msg_details_txt);
if (type == ConversationAdapter.ConversationMessageType.INCOMING_TEXT_MESSAGE.getType()) {
- mPhoto = (ImageView) v.findViewById(R.id.photo);
+ mPhoto = v.findViewById(R.id.photo);
}
}
}
diff --git a/ring-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java b/ring-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java
index e6caaea..3aa7089 100644
--- a/ring-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java
+++ b/ring-android/app/src/main/java/cx/ring/views/CredentialPreferenceDialog.java
@@ -78,9 +78,9 @@
protected void onBindDialogView(View view) {
super.onBindDialogView(view);
- mUsernameField = (EditText) view.findViewById(R.id.credentials_username);
- mPasswordField = (EditText) view.findViewById(R.id.credentials_password);
- mRealmField = (EditText) view.findViewById(R.id.credentials_realm);
+ mUsernameField = view.findViewById(R.id.credentials_username);
+ mPasswordField = view.findViewById(R.id.credentials_password);
+ mRealmField = view.findViewById(R.id.credentials_realm);
if (mUsernameField == null) {
throw new IllegalStateException("Dialog view must contain an EditText with id @id/credentials_username");
} else if (creds != null) {
diff --git a/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml b/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml
index 8bac0f7..a27aebb 100644
--- a/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml
+++ b/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml
@@ -46,6 +46,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
+ android:baselineAligned="false"
android:gravity="center"
android:orientation="horizontal">
@@ -71,12 +72,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
- android:layout_toRightOf="@+id/anchor"
+ android:layout_toEndOf="@+id/anchor"
android:contentDescription="@string/take_a_photo"
- android:src="@drawable/ic_photo_camera"
android:text="@string/take_a_photo"
app:backgroundTint="@color/light"
- app:rippleColor="@android:color/white" />
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_photo_camera" />
<Space
android:id="@+id/anchor"
@@ -90,17 +91,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
- android:layout_toLeftOf="@+id/anchor"
+ android:layout_toStartOf="@+id/anchor"
android:contentDescription="@string/open_the_gallery"
- android:src="@drawable/ic_insert_photo"
android:text="@string/open_the_gallery"
app:backgroundTint="@color/light"
- app:rippleColor="@android:color/white" />
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_insert_photo" />
</RelativeLayout>
<cx.ring.views.BoundedRelativeLayout
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
app:bounded_width="300dp">
diff --git a/ring-android/app/src/main/res/layout-land/frag_call.xml b/ring-android/app/src/main/res/layout-land/frag_call.xml
index 8bbabda..2d07593 100644
--- a/ring-android/app/src/main/res/layout-land/frag_call.xml
+++ b/ring-android/app/src/main/res/layout-land/frag_call.xml
@@ -38,7 +38,6 @@
android:layout_height="120dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_margin="8dp"
android:visibility="gone"
tools:visibility="visible" />
@@ -123,7 +122,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:contentDescription="@string/action_call_decline"
- android:src="@drawable/ic_call_end_white"
+ app:srcCompat="@drawable/ic_call_end_white"
app:backgroundTint="@color/error_red"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
@@ -135,7 +134,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:contentDescription="@string/action_call_accept"
- android:src="@drawable/ic_call_white"
+ app:srcCompat="@drawable/ic_call_white"
app:backgroundTint="#4caf50"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
@@ -153,7 +152,7 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="48dp"
- android:src="@drawable/ic_call_end_white"
+ app:srcCompat="@drawable/ic_call_end_white"
app:backgroundTint="@color/error_red"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
diff --git a/ring-android/app/src/main/res/layout-w720dp-land/activity_home.xml b/ring-android/app/src/main/res/layout-w720dp-land/activity_home.xml
index 91ddc05..ee52dbb 100644
--- a/ring-android/app/src/main/res/layout-w720dp-land/activity_home.xml
+++ b/ring-android/app/src/main/res/layout-w720dp-land/activity_home.xml
@@ -34,13 +34,13 @@
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingLeft="@dimen/drawer_content_padding">
+ android:paddingEnd="0dp"
+ android:paddingStart="@dimen/drawer_content_padding">
<android.support.v7.widget.Toolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@color/color_primary_light"
@@ -62,7 +62,8 @@
android:elevation="@dimen/toolbar_elevation"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:paddingLeft="@dimen/toolbar_content_inset"
+ android:paddingEnd="0dp"
+ android:paddingStart="@dimen/toolbar_content_inset"
android:visibility="gone">
<TextView
@@ -79,7 +80,6 @@
android:id="@+id/main_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/toolbar_spacer"
android:orientation="vertical" />
@@ -89,10 +89,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/toolbar_spacer"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="@dimen/action_button_bpadding"
- android:layout_marginLeft="@dimen/action_button_lpadding"
android:layout_marginStart="@dimen/action_button_lpadding"
android:adjustViewBounds="false"
android:baselineAlignBottom="false"
diff --git a/ring-android/app/src/main/res/layout-w960dp-land/frag_smartlist.xml b/ring-android/app/src/main/res/layout-w960dp-land/frag_smartlist.xml
index c6e5d80..5db5bad 100644
--- a/ring-android/app/src/main/res/layout-w960dp-land/frag_smartlist.xml
+++ b/ring-android/app/src/main/res/layout-w960dp-land/frag_smartlist.xml
@@ -11,7 +11,6 @@
android:id="@+id/error_msg_pane"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@color/error_pane"
@@ -23,10 +22,9 @@
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:scaleType="fitCenter"
- android:src="@drawable/ic_settings_white" />
+ app:srcCompat="@drawable/ic_settings_white" />
<TextView
android:id="@+id/error_msg_txt"
@@ -73,7 +71,6 @@
android:id="@+id/confs_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="0dp"
android:layout_marginStart="0dp"
android:clipToPadding="false"
android:divider="@null"
@@ -104,11 +101,11 @@
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_compat_margin"
android:elevation="6dp"
- android:src="@drawable/ic_dialpad_white"
app:backgroundTint="@color/color_primary_light"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
- app:rippleColor="@color/color_primary_dark" />
+ app:rippleColor="@color/color_primary_dark"
+ app:srcCompat="@drawable/ic_dialpad_white" />
</FrameLayout>
@@ -116,15 +113,13 @@
android:id="@+id/separator"
android:layout_width="1dp"
android:layout_height="match_parent"
- android:background="@color/darker_gray"
- android:layout_toRightOf="@+id/smartlist_layout"
- android:layout_toEndOf="@+id/smartlist_layout"/>
+ android:layout_toEndOf="@+id/smartlist_layout"
+ android:background="@color/darker_gray" />
<FrameLayout
android:id="@+id/conversation_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_toRightOf="@+id/separator"
- android:layout_toEndOf="@+id/separator"/>
+ android:layout_toEndOf="@+id/separator" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout-w960dp-land/tv_activity_account_management.xml b/ring-android/app/src/main/res/layout-w960dp-land/tv_activity_account_management.xml
new file mode 100644
index 0000000..7b8e139
--- /dev/null
+++ b/ring-android/app/src/main/res/layout-w960dp-land/tv_activity_account_management.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Adrien Beraud <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.
+-->
+
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/details_fragment"
+ android:name="cx.ring.tv.account.AccountManagementDetailsFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout-w960dp-land/tv_activity_wizard.xml b/ring-android/app/src/main/res/layout-w960dp-land/tv_activity_wizard.xml
index a1f039b..b3f4c2d 100644
--- a/ring-android/app/src/main/res/layout-w960dp-land/tv_activity_wizard.xml
+++ b/ring-android/app/src/main/res/layout-w960dp-land/tv_activity_wizard.xml
@@ -1,4 +1,5 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_primary_dark">
@@ -10,7 +11,7 @@
android:layout_centerVertical="true"
android:layout_margin="36dp"
android:contentDescription="@string/app_name"
- android:src="@drawable/ic_ring_logo_white" />
+ app:srcCompat="@drawable/ic_ring_logo_white" />
<TextView
android:id="@+id/ring_acc_title_txt"
diff --git a/ring-android/app/src/main/res/layout-w960dp-land/tv_frag_call.xml b/ring-android/app/src/main/res/layout-w960dp-land/tv_frag_call.xml
index b808c23..afd7038 100644
--- a/ring-android/app/src/main/res/layout-w960dp-land/tv_frag_call.xml
+++ b/ring-android/app/src/main/res/layout-w960dp-land/tv_frag_call.xml
@@ -17,13 +17,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false"
- android:clipToPadding="false"
- tools:context=".tv.call.TVCallActivity">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:clipToPadding="false"
+ tools:context=".tv.call.TVCallActivity">
<SurfaceView
android:id="@+id/video_preview_surface"
@@ -32,7 +32,7 @@
android:layout_centerInParent="true"
android:layout_gravity="center"
android:visibility="gone"
- tools:visibility="visible"/>
+ tools:visibility="visible" />
<SurfaceView
android:id="@+id/camera_preview_surface"
@@ -40,10 +40,9 @@
android:layout_height="120dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_margin="8dp"
android:visibility="gone"
- tools:visibility="visible"/>
+ tools:visibility="visible" />
<LinearLayout
android:id="@+id/contact_bubble_layout"
@@ -69,7 +68,7 @@
android:layout_width="160dp"
android:layout_height="160dp"
android:layout_centerInParent="true"
- tools:src="@drawable/ic_contact_picture"/>
+ tools:src="@drawable/ic_contact_picture" />
</com.skyfishjy.library.RippleBackground>
<LinearLayout
@@ -77,10 +76,10 @@
android:layout_height="match_parent"
android:layout_margin="10dp"
android:layout_weight="50"
- android:gravity="center"
- android:orientation="vertical"
android:clipChildren="false"
- android:clipToPadding="false">
+ android:clipToPadding="false"
+ android:gravity="center"
+ android:orientation="vertical">
<TextView
android:id="@+id/contact_bubble_txt"
@@ -92,7 +91,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/text_color_primary_dark"
android:transitionName="shared_element"
- tools:text="Contact Name"/>
+ tools:text="Contact Name" />
<TextView
android:id="@+id/contact_bubble_num_txt"
@@ -105,7 +104,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/text_color_secondary_dark"
- tools:text="ring:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"/>
+ tools:text="ring:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" />
<TextView
android:id="@+id/call_status_txt"
@@ -114,7 +113,7 @@
android:layout_gravity="center_horizontal"
android:textColor="@color/text_color_primary_dark"
android:textSize="16sp"
- tools:text="Connecting"/>
+ tools:text="Connecting" />
<LinearLayout
android:layout_width="wrap_content"
@@ -128,11 +127,11 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:contentDescription="@string/action_call_decline"
- android:src="@drawable/ic_call_end_white"
app:backgroundTint="@color/error_red"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
- app:rippleColor="@android:color/white"/>
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_call_end_white" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/call_accept_btn"
@@ -140,11 +139,11 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:contentDescription="@string/action_call_accept"
- android:src="@drawable/ic_call_white"
app:backgroundTint="#4caf50"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
- app:rippleColor="@android:color/white"/>
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_call_white" />
</LinearLayout>
@@ -159,9 +158,9 @@
android:layout_centerHorizontal="true"
android:layout_margin="16dp"
android:layout_marginBottom="48dp"
- android:src="@drawable/ic_call_end_white"
app:backgroundTint="@color/error_red"
- app:rippleColor="@android:color/white"/>
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_call_end_white" />
<EditText
android:id="@+id/dialpad_edit_text"
@@ -169,6 +168,6 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="phone"
- android:visibility="visible"/>
+ android:visibility="visible" />
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/activity_conversation.xml b/ring-android/app/src/main/res/layout/activity_conversation.xml
index a2a928a..8840c64 100644
--- a/ring-android/app/src/main/res/layout/activity_conversation.xml
+++ b/ring-android/app/src/main/res/layout/activity_conversation.xml
@@ -11,7 +11,6 @@
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@color/color_primary_light"
@@ -28,7 +27,6 @@
android:id="@+id/main_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/main_toolbar" />
</RelativeLayout>
\ No newline at end of file
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 29013ff..4622f2d 100644
--- a/ring-android/app/src/main/res/layout/activity_home.xml
+++ b/ring-android/app/src/main/res/layout/activity_home.xml
@@ -39,7 +39,6 @@
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@color/color_primary_light"
@@ -61,7 +60,8 @@
android:elevation="@dimen/toolbar_elevation"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:paddingLeft="@dimen/toolbar_content_inset"
+ android:paddingEnd="0dp"
+ android:paddingStart="@dimen/toolbar_content_inset"
android:visibility="gone">
<TextView
@@ -78,7 +78,6 @@
android:id="@+id/main_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/toolbar_spacer"
android:orientation="vertical" />
@@ -88,10 +87,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/toolbar_spacer"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="@dimen/action_button_bpadding"
- android:layout_marginLeft="@dimen/action_button_lpadding"
android:layout_marginStart="@dimen/action_button_lpadding"
android:adjustViewBounds="false"
android:baselineAlignBottom="false"
diff --git a/ring-android/app/src/main/res/layout/camerapicker.xml b/ring-android/app/src/main/res/layout/camerapicker.xml
index 6dfa33e..5539f23 100644
--- a/ring-android/app/src/main/res/layout/camerapicker.xml
+++ b/ring-android/app/src/main/res/layout/camerapicker.xml
@@ -1,27 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<FrameLayout
android:id="@+id/camera_preview"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"/>
-
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/button_capture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="16dp"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
android:contentDescription="@string/action_call_decline"
+ android:padding="16dp"
android:src="@drawable/ic_photo_camera"
app:backgroundTint="@color/holo_green_dark"
- app:elevation="6dp"
- app:pressedTranslationZ="12dp"
app:rippleColor="@android:color/white"
- android:layout_alignParentBottom="true"
- android:layout_centerHorizontal="true"/>
+ app:useCompatPadding="true" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/detail_view_content.xml b/ring-android/app/src/main/res/layout/detail_view_content.xml
index eb47475..130e4c8 100644
--- a/ring-android/app/src/main/res/layout/detail_view_content.xml
+++ b/ring-android/app/src/main/res/layout/detail_view_content.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<TextView
android:id="@+id/primary_text"
@@ -16,7 +17,7 @@
android:layout_marginBottom="3dp"
android:layout_marginTop="15dp"
android:fontFamily="sans-serif-light"
- android:text="Title Text"/>
+ tools:text="Title Text" />
<TextView
@@ -25,6 +26,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-regular"
- android:text=""/>
+ android:text="" />
</LinearLayout>
</ScrollView>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/dialog_profile.xml b/ring-android/app/src/main/res/layout/dialog_profile.xml
index 8f1667b..f495f69 100644
--- a/ring-android/app/src/main/res/layout/dialog_profile.xml
+++ b/ring-android/app/src/main/res/layout/dialog_profile.xml
@@ -35,9 +35,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
- android:layout_toRightOf="@+id/anchor"
+ android:layout_toEndOf="@+id/anchor"
android:contentDescription="@string/take_a_photo"
- android:src="@drawable/ic_photo_camera"
+ app:srcCompat="@drawable/ic_photo_camera"
android:text="@string/take_a_photo"
app:backgroundTint="@color/light"
app:rippleColor="@android:color/white" />
@@ -54,9 +54,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
- android:layout_toLeftOf="@+id/anchor"
+ android:layout_toStartOf="@+id/anchor"
android:contentDescription="@string/open_the_gallery"
- android:src="@drawable/ic_insert_photo"
+ app:srcCompat="@drawable/ic_insert_photo"
android:text="@string/open_the_gallery"
app:backgroundTint="@color/light"
app:rippleColor="@android:color/white" />
diff --git a/ring-android/app/src/main/res/layout/frag_about.xml b/ring-android/app/src/main/res/layout/frag_about.xml
index 5f8582a..7d5041c 100644
--- a/ring-android/app/src/main/res/layout/frag_about.xml
+++ b/ring-android/app/src/main/res/layout/frag_about.xml
@@ -79,6 +79,7 @@
android:layout_margin="5dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -136,6 +137,7 @@
android:layout_margin="5dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -166,6 +168,7 @@
android:layout_margin="5dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:gravity="center_vertical"
android:orientation="vertical">
diff --git a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
index 6568f63..a7ba42c 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
@@ -1,4 +1,5 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -19,7 +20,7 @@
android:layout_gravity="center"
android:layout_margin="16dp"
android:contentDescription="@string/app_name"
- android:src="@drawable/ic_logo_ring_white" />
+ app:srcCompat="@drawable/ic_logo_ring_white" />
<TextView
android:id="@+id/ring_acc_title_txt"
diff --git a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
index f1b9cfe..f4cf94a 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
@@ -65,12 +65,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
- android:layout_toRightOf="@+id/anchor"
+ android:layout_toEndOf="@+id/anchor"
android:contentDescription="@string/take_a_photo"
- android:src="@drawable/ic_photo_camera"
android:text="@string/take_a_photo"
app:backgroundTint="@color/light"
- app:rippleColor="@android:color/white" />
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_photo_camera" />
<Space
android:id="@+id/anchor"
@@ -84,12 +84,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
- android:layout_toLeftOf="@+id/anchor"
+ android:layout_toStartOf="@+id/anchor"
android:contentDescription="@string/open_the_gallery"
- android:src="@drawable/ic_insert_photo"
android:text="@string/open_the_gallery"
app:backgroundTint="@color/light"
- app:rippleColor="@android:color/white" />
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_insert_photo" />
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_account_migration.xml b/ring-android/app/src/main/res/layout/frag_account_migration.xml
index cc5f4a3..3ed73bc 100644
--- a/ring-android/app/src/main/res/layout/frag_account_migration.xml
+++ b/ring-android/app/src/main/res/layout/frag_account_migration.xml
@@ -51,7 +51,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_margin="16dp"
android:contentDescription="@string/app_name"
@@ -61,10 +60,8 @@
android:id="@+id/ring_acc_title_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_toLeftOf="@+id/imageView6"
android:layout_toStartOf="@+id/imageView6"
android:paddingLeft="16dp"
android:paddingRight="16dp"
@@ -77,7 +74,6 @@
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/ring_acc_title_txt"
android:paddingBottom="24dp"
diff --git a/ring-android/app/src/main/res/layout/frag_blacklist.xml b/ring-android/app/src/main/res/layout/frag_blacklist.xml
index f78b539..5e3b2c0 100644
--- a/ring-android/app/src/main/res/layout/frag_blacklist.xml
+++ b/ring-android/app/src/main/res/layout/frag_blacklist.xml
@@ -10,7 +10,6 @@
android:id="@+id/blacklist"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="0dp"
android:layout_marginStart="0dp"
android:clipToPadding="false"
android:divider="@null"
diff --git a/ring-android/app/src/main/res/layout/frag_call.xml b/ring-android/app/src/main/res/layout/frag_call.xml
index fce7e49..c1bc624 100644
--- a/ring-android/app/src/main/res/layout/frag_call.xml
+++ b/ring-android/app/src/main/res/layout/frag_call.xml
@@ -38,7 +38,6 @@
android:layout_height="120dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_margin="12dp"
android:visibility="gone"
tools:visibility="visible" />
@@ -73,8 +72,8 @@
android:id="@+id/contact_bubble_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
android:ellipsize="middle"
+ android:gravity="center_horizontal"
android:paddingEnd="32dp"
android:paddingStart="32dp"
android:singleLine="true"
@@ -122,11 +121,11 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:contentDescription="@string/action_call_decline"
- android:src="@drawable/ic_call_end_white"
app:backgroundTint="@color/error_red"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
- app:rippleColor="@android:color/white" />
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_call_end_white" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/call_accept_btn"
@@ -134,11 +133,11 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:contentDescription="@string/action_call_accept"
- android:src="@drawable/ic_call_white"
app:backgroundTint="#4caf50"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
- app:rippleColor="@android:color/white" />
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_call_white" />
</LinearLayout>
@@ -150,12 +149,12 @@
android:layout_centerInParent="true"
android:layout_marginBottom="64dp"
android:contentDescription="@string/action_call_hangup"
- android:src="@drawable/ic_call_end_white"
android:visibility="gone"
app:backgroundTint="@color/error_red"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/ic_call_end_white"
tools:visibility="visible" />
<EditText
diff --git a/ring-android/app/src/main/res/layout/frag_conversation.xml b/ring-android/app/src/main/res/layout/frag_conversation.xml
index f0e66c2..f8ebf96 100644
--- a/ring-android/app/src/main/res/layout/frag_conversation.xml
+++ b/ring-android/app/src/main/res/layout/frag_conversation.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -10,8 +11,6 @@
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:clipToPadding="false"
@@ -44,8 +43,6 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="16dp"
android:layout_marginLeft="8dp"
@@ -83,8 +80,8 @@
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/send_message"
android:padding="8dp"
- android:src="@drawable/ic_send_black"
- android:tint="@android:color/darker_gray" />
+ android:tint="@android:color/darker_gray"
+ app:srcCompat="@drawable/ic_send_black" />
</LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_device_list.xml b/ring-android/app/src/main/res/layout/frag_device_list.xml
index 845e218..854d018 100644
--- a/ring-android/app/src/main/res/layout/frag_device_list.xml
+++ b/ring-android/app/src/main/res/layout/frag_device_list.xml
@@ -44,7 +44,6 @@
android:id="@+id/account_alias_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_toLeftOf="@+id/account_switch"
android:layout_toStartOf="@+id/account_switch"
android:paddingBottom="8dp"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Large"
@@ -65,8 +64,7 @@
android:id="@+id/account_switch"
android:layout_width="50dp"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true" />
+ android:layout_alignParentEnd="true" />
</RelativeLayout>
@@ -93,7 +91,6 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:gravity="center_vertical"
- android:lines="1"
android:paddingBottom="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
@@ -167,8 +164,6 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingBottom="16dp"
- android:paddingEnd="16dp"
- android:paddingRight="16dp"
android:paddingTop="4dp"
android:text="@string/registered_username" />
@@ -180,8 +175,6 @@
android:layout_gravity="start"
android:paddingBottom="16dp"
android:paddingEnd="8dp"
- android:paddingLeft="16dp"
- android:paddingRight="8dp"
android:paddingStart="16dp"
android:paddingTop="4dp"
android:textAlignment="viewStart"
diff --git a/ring-android/app/src/main/res/layout/frag_navigation.xml b/ring-android/app/src/main/res/layout/frag_navigation.xml
index b3f7443..1515674 100644
--- a/ring-android/app/src/main/res/layout/frag_navigation.xml
+++ b/ring-android/app/src/main/res/layout/frag_navigation.xml
@@ -45,10 +45,9 @@
android:layout_height="wrap_content"
android:layout_alignTop="@+id/anchor"
android:layout_toEndOf="@+id/anchor"
- android:layout_toRightOf="@+id/anchor"
- android:src="@drawable/ic_action_edit"
app:backgroundTint="@color/transparent_light"
- app:fabSize="mini" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/ic_action_edit" />
</RelativeLayout>
@@ -58,14 +57,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/profile_container"
android:layout_toEndOf="@+id/profile_container"
- android:layout_toRightOf="@+id/profile_container"
android:background="?attr/selectableItemBackground"
- android:clickable="true">
+ android:clickable="true"
+ android:focusable="true">
<include layout="@layout/item_account_selected" />
@@ -77,12 +74,9 @@
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/profile_container"
android:layout_toEndOf="@+id/profile_container"
- android:layout_toRightOf="@+id/profile_container"
android:gravity="center"
android:text="@string/action_create"
android:visibility="gone" />
diff --git a/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml b/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
index 5538621..7b6c478 100644
--- a/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
+++ b/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
@@ -14,7 +14,6 @@
android:background="#e3c1c1"
android:ellipsize="middle"
android:gravity="center"
- android:maxLines="1"
android:singleLine="true"
android:text="@string/contact_request_account"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -26,7 +25,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/pane_ringID"
- android:layout_marginLeft="0dp"
android:layout_marginStart="0dp"
android:clipToPadding="false"
android:divider="@null"
diff --git a/ring-android/app/src/main/res/layout/frag_settings.xml b/ring-android/app/src/main/res/layout/frag_settings.xml
index df2552e..05df998 100644
--- a/ring-android/app/src/main/res/layout/frag_settings.xml
+++ b/ring-android/app/src/main/res/layout/frag_settings.xml
@@ -57,30 +57,27 @@
android:id="@+id/network_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
- android:src="@drawable/ic_perm_data_setting_black_24dp"
- android:contentDescription="@string/pref_mobileData_summary" />
+ android:contentDescription="@string/pref_mobileData_summary"
+ android:src="@drawable/ic_perm_data_setting_black_24dp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/network_image"
- android:layout_toRightOf="@+id/network_image"
- android:layout_toStartOf="@+id/settings_mobile_data"
- android:layout_toLeftOf="@+id/settings_mobile_data"
android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/network_image"
+ android:layout_toStartOf="@+id/settings_mobile_data"
+ android:orientation="vertical"
android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:orientation="vertical">
+ android:paddingRight="16dp">
<TextView
style="@style/ListPrimary"
@@ -100,7 +97,6 @@
android:id="@+id/settings_mobile_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:checked="false" />
@@ -127,30 +123,27 @@
android:id="@+id/contacts_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
- android:src="@drawable/ic_group_black"
- android:contentDescription="@string/pref_systemContacts_summary" />
+ android:contentDescription="@string/pref_systemContacts_summary"
+ app:srcCompat="@drawable/ic_group_black" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/contacts_image"
- android:layout_toRightOf="@+id/contacts_image"
- android:layout_toStartOf="@+id/settings_contacts"
- android:layout_toLeftOf="@+id/settings_contacts"
android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/contacts_image"
+ android:layout_toStartOf="@+id/settings_contacts"
+ android:orientation="vertical"
android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:orientation="vertical">
+ android:paddingRight="16dp">
<TextView
style="@style/ListPrimary"
@@ -170,7 +163,6 @@
android:id="@+id/settings_contacts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:checked="false" />
@@ -197,37 +189,34 @@
android:id="@+id/system_dialer_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
- android:src="@drawable/ic_dialpad_black"
- android:contentDescription="@string/pref_systemDialer_summary" />
+ android:contentDescription="@string/pref_systemDialer_summary"
+ app:srcCompat="@drawable/ic_dialpad_black" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/system_dialer_image"
- android:layout_toRightOf="@+id/system_dialer_image"
- android:layout_toStartOf="@+id/settings_place_call"
- android:layout_toLeftOf="@+id/settings_place_call"
android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/system_dialer_image"
+ android:layout_toStartOf="@+id/settings_place_call"
+ android:orientation="vertical"
android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:orientation="vertical">
+ android:paddingRight="16dp">
<TextView
style="@style/ListPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:lines="1"
android:ellipsize="end"
+ android:lines="1"
android:text="@string/pref_systemDialer_title" />
<TextView
@@ -241,7 +230,6 @@
android:id="@+id/settings_place_call"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:checked="false" />
@@ -258,38 +246,35 @@
android:id="@+id/system_startOnBoot_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true">
- <ImageView
+ <ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
- android:src="@drawable/ic_android_black"
- android:contentDescription="@string/pref_startOnBoot_summary" />
+ android:contentDescription="@string/pref_startOnBoot_summary"
+ app:srcCompat="@drawable/ic_android_black" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/system_startOnBoot_image"
- android:layout_toRightOf="@+id/system_startOnBoot_image"
- android:layout_toStartOf="@+id/settings_startup"
- android:layout_toLeftOf="@+id/settings_startup"
android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/system_startOnBoot_image"
+ android:layout_toStartOf="@+id/settings_startup"
+ android:orientation="vertical"
android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:orientation="vertical">
+ android:paddingRight="16dp">
<TextView
style="@style/ListPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:lines="1"
android:ellipsize="end"
+ android:lines="1"
android:text="@string/pref_startOnBoot_title" />
<TextView
@@ -303,7 +288,6 @@
android:id="@+id/settings_startup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:checked="false" />
@@ -324,15 +308,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
- android:padding="8dp"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:padding="8dp">
<TextView
style="@style/ListPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:lines="1"
android:ellipsize="end"
+ android:lines="1"
android:text="@string/pref_clearHistory_title" />
<TextView
diff --git a/ring-android/app/src/main/res/layout/frag_share.xml b/ring-android/app/src/main/res/layout/frag_share.xml
index 1d246d4..8d37e81 100644
--- a/ring-android/app/src/main/res/layout/frag_share.xml
+++ b/ring-android/app/src/main/res/layout/frag_share.xml
@@ -39,9 +39,7 @@
android:layout_height="wrap_content"
android:layout_above="@+id/qr_image"
android:layout_alignEnd="@+id/qr_image"
- android:layout_alignLeft="@+id/qr_image"
android:layout_alignParentTop="true"
- android:layout_alignRight="@+id/qr_image"
android:layout_alignStart="@+id/qr_image"
android:gravity="center"
android:paddingBottom="24sp"
diff --git a/ring-android/app/src/main/res/layout/frag_smartlist.xml b/ring-android/app/src/main/res/layout/frag_smartlist.xml
index f06ef17..308da39 100644
--- a/ring-android/app/src/main/res/layout/frag_smartlist.xml
+++ b/ring-android/app/src/main/res/layout/frag_smartlist.xml
@@ -30,7 +30,6 @@
android:id="@+id/error_msg_pane"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@color/error_pane"
@@ -42,10 +41,9 @@
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:scaleType="fitCenter"
- android:src="@drawable/ic_settings_white" />
+ app:srcCompat="@drawable/ic_settings_white" />
<TextView
android:id="@+id/error_msg_txt"
@@ -92,7 +90,6 @@
android:id="@+id/confs_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="0dp"
android:layout_marginStart="0dp"
android:clipToPadding="false"
android:divider="@null"
@@ -124,16 +121,15 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_alignWithParentIfMissing="false"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_compat_margin"
android:layout_marginTop="40dp"
android:elevation="6dp"
- android:src="@drawable/ic_dialpad_white"
app:backgroundTint="@color/color_primary_light"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
- app:rippleColor="@color/color_primary_dark" />
+ app:rippleColor="@color/color_primary_dark"
+ app:srcCompat="@drawable/ic_dialpad_white" />
</RelativeLayout>
\ No newline at end of file
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 f258568..3960d91 100644
--- a/ring-android/app/src/main/res/layout/item_account.xml
+++ b/ring-android/app/src/main/res/layout/item_account.xml
@@ -16,6 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="60dp"
@@ -30,7 +31,6 @@
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
tools:src="@drawable/ic_contact_picture" />
<TextView
@@ -39,8 +39,6 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toEndOf="@+id/account_photo"
- android:layout_toLeftOf="@+id/account_disabled"
- android:layout_toRightOf="@+id/account_photo"
android:layout_toStartOf="@+id/account_disabled"
android:ellipsize="end"
android:lines="1"
@@ -54,9 +52,7 @@
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/account_alias"
android:layout_alignWithParentIfMissing="true"
- android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
- android:layout_toLeftOf="@+id/loading_indicator"
android:layout_toStartOf="@+id/loading_indicator"
android:text="@string/account_disabled_indicator"
android:textStyle="italic" />
@@ -65,15 +61,11 @@
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="false"
android:layout_alignParentStart="false"
android:layout_below="@+id/account_alias"
android:layout_toEndOf="@+id/account_photo"
- android:layout_toLeftOf="@+id/loading_indicator"
- android:layout_toRightOf="@+id/account_photo"
android:layout_toStartOf="@+id/loading_indicator"
android:ellipsize="middle"
- android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/ListSecondary"
tools:text="ring:b982672502b9f1236a68353d74734cb82f9d1fab" />
@@ -85,9 +77,7 @@
android:layout_height="wrap_content"
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
- android:layout_toLeftOf="@+id/error_indicator"
android:layout_toStartOf="@+id/error_indicator"
android:visibility="gone" />
@@ -96,15 +86,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
- android:src="@drawable/ic_error_white"
android:tint="@color/error_red"
- android:visibility="gone" />
+ android:visibility="gone"
+ app:srcCompat="@drawable/ic_error_white" />
</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 76c92ec..56abc28 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
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="72dp">
@@ -8,36 +10,32 @@
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="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
- android:layout_toLeftOf="@+id/error_indicator"
android:layout_toStartOf="@id/error_indicator"
android:focusable="false"
android:gravity="start"
android:textAlignment="viewStart"
- android:textAppearance="@style/ListPrimary" />
+ android:textAppearance="@style/ListPrimary"
+ tools:text="Ring account" />
<TextView
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/account_alias"
- android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
- android:layout_toLeftOf="@+id/error_indicator"
android:layout_toStartOf="@id/error_indicator"
android:ellipsize="middle"
android:focusable="false"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
- android:textAppearance="@style/ListSecondary" />
+ android:textAppearance="@style/ListSecondary"
+ tools:text="testaccount" />
<ImageView
android:id="@+id/error_indicator"
@@ -45,14 +43,13 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="16dp"
- android:layout_toLeftOf="@+id/account_checked"
android:layout_toStartOf="@+id/account_checked"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
- android:src="@drawable/ic_error_white"
android:tint="@color/error_red"
- android:visibility="gone" />
+ android:visibility="gone"
+ app:srcCompat="@drawable/ic_error_white" />
<ProgressBar
android:id="@+id/loading_indicator"
@@ -61,8 +58,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
- android:layout_toLeftOf="@+id/account_checked"
android:layout_toStartOf="@+id/account_checked"
android:visibility="gone" />
@@ -71,7 +66,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_margin="16dp"
android:focusable="false" />
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 a7b0cee..55df4f6 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
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="72dp"
@@ -13,10 +14,8 @@
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_toLeftOf="@+id/account_disabled"
android:layout_toStartOf="@+id/account_disabled"
android:ellipsize="end"
android:fontFamily="sans-serif-medium"
@@ -32,9 +31,7 @@
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/account_alias"
android:layout_alignWithParentIfMissing="true"
- android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
- android:layout_toLeftOf="@+id/loading_indicator"
android:layout_toStartOf="@+id/loading_indicator"
android:text="@string/account_disabled_indicator"
android:textStyle="italic" />
@@ -43,13 +40,10 @@
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/account_alias"
- android:layout_toLeftOf="@+id/loading_indicator"
android:layout_toStartOf="@+id/loading_indicator"
android:ellipsize="middle"
- android:maxLines="1"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white"
@@ -62,9 +56,7 @@
android:layout_height="wrap_content"
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
- android:layout_toLeftOf="@+id/error_indicator"
android:layout_toStartOf="@+id/error_indicator" />
<ImageView
@@ -73,13 +65,11 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="false"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
- android:layout_toLeftOf="@+id/account_selected_arrow"
android:layout_toStartOf="@+id/account_selected_arrow"
android:clickable="false"
android:focusable="false"
- android:src="@drawable/ic_error_white" />
+ app:srcCompat="@drawable/ic_error_white" />
<ImageView
android:id="@+id/account_selected_arrow"
@@ -87,14 +77,12 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_marginBottom="16dp"
- android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:alpha="0.54"
android:clickable="false"
android:focusable="false"
- android:src="@drawable/ic_arrow_drop_down_black_24dp"
- android:tint="@color/white" />
+ android:tint="@color/white"
+ app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp" />
</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 63eb9fb..46c6670 100644
--- a/ring-android/app/src/main/res/layout/item_codec.xml
+++ b/ring-android/app/src/main/res/layout/item_codec.xml
@@ -28,7 +28,6 @@
android:id="@+id/codec_name"
android:layout_width="wrap_content"
android:layout_height="?android:attr/listPreferredItemHeight"
- android:layout_marginLeft="16dp"
android:gravity="center_vertical"
android:text="H.264"
android:textColor="@color/text_color_primary"
@@ -40,9 +39,7 @@
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/codec_name"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dp"
android:layout_toEndOf="@id/codec_name"
- android:layout_toRightOf="@+id/codec_name"
android:gravity="center_vertical"
android:text="32000"
android:textColor="@color/text_color_secondary"
@@ -53,7 +50,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
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 56b978f..e06a493 100644
--- a/ring-android/app/src/main/res/layout/item_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_contact.xml
@@ -21,6 +21,7 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="72dp"
@@ -31,7 +32,6 @@
android:id="@+id/photo"
android:layout_width="48dp"
android:layout_height="48dp"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
@@ -46,8 +46,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/photo"
- android:layout_toLeftOf="@+id/quick_call"
- android:layout_toRightOf="@+id/photo"
android:layout_toStartOf="@+id/quick_call"
android:ellipsize="end"
android:gravity="start"
@@ -64,13 +62,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:alpha="0.54"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/contact_quick_call_description"
android:padding="16dp"
- android:src="@drawable/ic_videocam_white"
- android:tint="@color/black" />
+ android:tint="@color/black"
+ app:srcCompat="@drawable/ic_videocam_white" />
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/item_contact_blacklist.xml b/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
index 7f2ab72..7e6623b 100644
--- a/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
+++ b/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -9,7 +10,6 @@
android:id="@+id/photo"
android:layout_width="48dp"
android:layout_height="48dp"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
@@ -24,12 +24,9 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/photo"
- android:layout_toLeftOf="@+id/unblock"
- android:layout_toRightOf="@+id/photo"
android:layout_toStartOf="@+id/unblock"
android:ellipsize="middle"
android:gravity="start"
- android:maxLines="1"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="@color/text_color_primary"
@@ -42,11 +39,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/contact_unblock"
android:padding="16dp"
- android:src="@drawable/ic_person_add_black" />
+ app:srcCompat="@drawable/ic_person_add_black" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_contact_request.xml b/ring-android/app/src/main/res/layout/item_contact_request.xml
index 0ae3eaf..0182411 100644
--- a/ring-android/app/src/main/res/layout/item_contact_request.xml
+++ b/ring-android/app/src/main/res/layout/item_contact_request.xml
@@ -11,7 +11,6 @@
android:layout_height="48dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
- android:layout_marginRight="8dp"
android:scaleType="centerCrop"
tools:src="@drawable/ic_contact_picture" />
@@ -21,7 +20,6 @@
android:layout_height="48dp"
android:layout_alignBaseline="@id/photo"
android:layout_toEndOf="@+id/photo"
- android:layout_toRightOf="@+id/photo"
android:gravity="center"
android:maxLines="1"
android:singleLine="true"
@@ -37,7 +35,6 @@
android:layout_height="48dp"
android:layout_alignBaseline="@id/photo"
android:layout_toEndOf="@+id/photo"
- android:layout_toRightOf="@+id/photo"
android:gravity="center_vertical"
android:orientation="vertical"
android:visibility="gone">
@@ -58,7 +55,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="middle"
- android:maxLines="1"
android:singleLine="true"
android:textColor="@color/text_color_primary"
android:textIsSelectable="false"
@@ -72,10 +68,8 @@
style="@style/ButtonColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/photo"
- android:drawableLeft="@drawable/ic_action_accept"
android:drawableStart="@drawable/ic_action_accept"
android:text="@string/accept" />
@@ -86,7 +80,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/photo"
android:layout_centerHorizontal="true"
- android:drawableLeft="@drawable/ic_delete_white"
android:drawableStart="@drawable/ic_delete_white"
android:text="@string/refuse" />
@@ -96,9 +89,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_below="@id/photo"
- android:drawableLeft="@drawable/ic_close_white"
android:drawableStart="@drawable/ic_close_white"
android:text="@string/block" />
diff --git a/ring-android/app/src/main/res/layout/item_conv_call.xml b/ring-android/app/src/main/res/layout/item_conv_call.xml
index 89dfa0d..d5cdd23 100644
--- a/ring-android/app/src/main/res/layout/item_conv_call.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_call.xml
@@ -18,6 +18,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
@@ -50,14 +52,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.75"
- android:src="@drawable/ic_call_missed_black" />
+ app:srcCompat="@drawable/ic_call_missed_black" />
+
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
- android:layout_marginRight="8dp"
android:orientation="vertical">
<TextView
@@ -67,17 +69,17 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="false"
- android:text="Appel manqué"
android:textColor="@color/text_color_primary"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ tools:text="Appel manqué" />
<TextView
android:id="@+id/call_details_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Adrien - 12 mars"
android:textColor="@color/text_color_secondary"
- android:textSize="12sp" />
+ android:textSize="12sp"
+ tools:text="Adrien - 12 mars" />
</LinearLayout>
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_me.xml b/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
index 2a45539..a43d501 100644
--- a/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
@@ -22,7 +22,7 @@
android:id="@+id/txt_entry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:background="@android:color/transparent"
android:focusable="false"
android:paddingBottom="4dp"
@@ -37,9 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
- android:layout_marginLeft="48dp"
android:layout_marginStart="48dp"
android:background="@drawable/textmsg_me_background"
android:orientation="vertical">
@@ -68,7 +66,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/msg_txt_bubble"
- android:layout_alignRight="@+id/msg_txt_bubble"
android:layout_below="@+id/msg_txt_bubble"
android:layout_marginBottom="8dp"
android:textColor="@color/text_color_secondary"
diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml b/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
index 206163d..6436535 100644
--- a/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
@@ -20,7 +20,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/txt_entry"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:focusable="false"
@@ -35,11 +35,9 @@
android:id="@+id/photo"
android:layout_width="40dp"
android:layout_height="40dp"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
android:background="@null"
android:scaleType="centerCrop" />
@@ -49,9 +47,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginEnd="48dp"
- android:layout_marginRight="48dp"
android:layout_toEndOf="@+id/photo"
- android:layout_toRightOf="@+id/photo"
android:autoLink="all"
android:background="@drawable/textmsg_background"
android:ellipsize="marquee"
@@ -74,7 +70,6 @@
android:layout_below="@+id/msg_txt"
android:layout_marginBottom="8dp"
android:layout_toEndOf="@id/photo"
- android:layout_toRightOf="@+id/photo"
android:textColor="@color/text_color_secondary"
android:textSize="14sp" />
diff --git a/ring-android/app/src/main/res/layout/item_device.xml b/ring-android/app/src/main/res/layout/item_device.xml
index 554bd2c..631db27 100644
--- a/ring-android/app/src/main/res/layout/item_device.xml
+++ b/ring-android/app/src/main/res/layout/item_device.xml
@@ -25,7 +25,6 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
app:srcCompat="@drawable/ic_desktop_windows_black" />
@@ -34,13 +33,10 @@
android:id="@+id/txt_device_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="56dp"
android:layout_marginStart="56dp"
- android:layout_toLeftOf="@+id/txt_device_thisflag"
android:layout_toStartOf="@+id/txt_device_thisflag"
android:ellipsize="end"
android:lines="1"
@@ -51,13 +47,11 @@
android:id="@+id/txt_device_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignLeft="@id/txt_device_label"
android:layout_alignStart="@+id/txt_device_label"
android:layout_below="@id/txt_device_label"
- android:layout_toLeftOf="@+id/rename_button"
android:layout_toStartOf="@+id/rename_button"
android:ellipsize="middle"
- android:maxLines="1"
+ android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
tools:text="b982672502b9f1236a68353d74734cb82f9d1fab" />
@@ -67,9 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/txt_device_label"
- android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
- android:layout_toLeftOf="@+id/rename_button"
android:layout_toStartOf="@+id/rename_button"
android:text="@string/account_device_this_indicator"
android:textStyle="italic" />
@@ -80,7 +72,6 @@
android:layout_height="wrap_content"
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/revoke_button"
android:layout_toStartOf="@+id/revoke_button"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/account_device_revoke"
@@ -93,7 +84,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/account_device_revoke"
diff --git a/ring-android/app/src/main/res/layout/item_menu.xml b/ring-android/app/src/main/res/layout/item_menu.xml
index 6de729d..5103ed6 100644
--- a/ring-android/app/src/main/res/layout/item_menu.xml
+++ b/ring-android/app/src/main/res/layout/item_menu.xml
@@ -12,7 +12,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:alpha="0.54"
tools:src="@drawable/ic_home_black" />
@@ -23,8 +22,6 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
- android:layout_marginLeft="72dp"
- android:layout_marginRight="16dp"
android:layout_marginStart="72dp"
android:alpha="0.87"
android:fontFamily="sans-serif-medium"
diff --git a/ring-android/app/src/main/res/layout/item_number.xml b/ring-android/app/src/main/res/layout/item_number.xml
index b2cf8d5..8c86c37 100644
--- a/ring-android/app/src/main/res/layout/item_number.xml
+++ b/ring-android/app/src/main/res/layout/item_number.xml
@@ -19,6 +19,8 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/call_entry"
android:layout_width="match_parent"
android:layout_height="56dp"
@@ -29,40 +31,37 @@
android:id="@+id/number_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="false"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
- android:layout_marginRight="8dp"
- android:src="@drawable/ic_dialer_sip_black" />
+ app:srcCompat="@drawable/ic_dialer_sip_black" />
<TextView
android:id="@+id/number_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
+ android:layout_marginEnd="8dp"
android:layout_marginTop="2dp"
- android:layout_toRightOf="@+id/number_icon"
+ android:layout_toEndOf="@+id/number_icon"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
- android:text="+15142792035"
android:textColor="@color/text_color_primary"
android:textSize="16sp"
- android:layout_marginRight="8dp" />
+ tools:text="+15142792035" />
<TextView
android:id="@+id/number_label_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/number_txt"
+ android:layout_marginEnd="8dp"
android:layout_toEndOf="@+id/number_icon"
- android:layout_toRightOf="@+id/number_icon"
- android:text="Inde"
android:textColor="@color/text_color_secondary"
android:textSize="12sp"
- android:layout_marginRight="8dp" />
+ tools:text="Inde" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_number_selected.xml b/ring-android/app/src/main/res/layout/item_number_selected.xml
index a24c507..9b95320 100644
--- a/ring-android/app/src/main/res/layout/item_number_selected.xml
+++ b/ring-android/app/src/main/res/layout/item_number_selected.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2004-2016 Savoir-faire Linux Inc.
Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
@@ -20,6 +19,7 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/call_entry"
android:layout_width="wrap_content"
android:layout_height="56dp"
@@ -27,15 +27,13 @@
android:padding="8dp">
<ImageView
+ android:id="@+id/number_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/number_icon"
- android:layout_alignParentLeft="true"
- android:src="@drawable/ic_dialer_sip_black"
android:layout_alignParentStart="true"
- android:layout_marginEnd="8dp"
- android:layout_marginRight="8dp"
android:layout_alignParentTop="false"
- android:layout_centerVertical="true" />
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="8dp"
+ app:srcCompat="@drawable/ic_dialer_sip_black" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_smartlist.xml b/ring-android/app/src/main/res/layout/item_smartlist.xml
index 0d3962c..c6b0f59 100644
--- a/ring-android/app/src/main/res/layout/item_smartlist.xml
+++ b/ring-android/app/src/main/res/layout/item_smartlist.xml
@@ -34,13 +34,12 @@
android:id="@+id/photo"
android:layout_width="60dp"
android:layout_height="60dp"
- android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
android:layout_centerVertical="true"
- android:paddingRight="4dp"
- android:paddingEnd="4dp"
- android:paddingBottom="4dp"
+ android:layout_marginEnd="16dp"
android:background="@null"
+ android:paddingBottom="4dp"
+ android:paddingEnd="4dp"
+ android:paddingStart="0dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_contact_picture" />
@@ -50,22 +49,19 @@
android:layout_height="22dp"
android:layout_alignBottom="@+id/photo"
android:layout_alignEnd="@+id/photo"
- android:layout_alignRight="@+id/photo"
android:src="@drawable/ic_online_indicator" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_toEndOf="@+id/photo"
- android:layout_toRightOf="@+id/photo">
+ android:layout_toEndOf="@+id/photo">
<TextView
android:id="@+id/conv_participant"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_toLeftOf="@+id/conv_last_time"
android:layout_toStartOf="@+id/conv_last_time"
android:ellipsize="marquee"
android:gravity="start"
@@ -96,7 +92,6 @@
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/conv_participant"
android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:textColor="@color/text_color_secondary"
android:textSize="12sp"
tools:text="2days ago" />
diff --git a/ring-android/app/src/main/res/values/attrs.xml b/ring-android/app/src/main/res/values/attrs.xml
index 4df9679..b9ba58e 100644
--- a/ring-android/app/src/main/res/values/attrs.xml
+++ b/ring-android/app/src/main/res/values/attrs.xml
@@ -45,7 +45,7 @@
<attr name="parallexOffset" format="float" />
</declare-styleable>
- <declare-styleable name="BoundedView">
+ <declare-styleable name="BoundedScrollView">
<attr name="bounded_width" format="dimension" />
<attr name="bounded_height" format="dimension" />
</declare-styleable>