small change to MediaPicker button

CHANGES.rst

@@ -21,6 +21,7 @@ Bugfix:
  - Fix Permalinks and registration issue (#2689)
  - Mention from read receipts list doesn't work (#656)
  - Fix issue when scrolling file list in room details (#2702)
+ - Align switch camera button to parent in landscape mode (#2703)
 
 Translations:
  -

vector/src/main/java/im/vector/activity/VectorMediasPickerActivity.java

@@ -237,7 +237,7 @@ public ActivityOtherThemes getOtherThemes() {
 
     @Override
     public int getLayoutRes() {
-        return R.layout.activity_vector_medias_picker;
+        return R.layout.activity_vector_media_picker;
     }
 
     @Override

vector/src/main/java/im/vector/activity/VectorMediasViewerActivity.java

@@ -117,7 +117,7 @@ public void transformPage(View view, float position) {
 
     @Override
     public int getLayoutRes() {
-        return R.layout.activity_vector_medias_viewer;
+        return R.layout.activity_vector_media_viewer;
     }
 
     @Override

vector/src/main/java/im/vector/activity/VectorRoomActivity.java

@@ -2302,7 +2302,7 @@ private void startStickerPickerActivity() {
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
             // Use the builder context
-            View v = LayoutInflater.from(builder.getContext()).inflate(R.layout.no_sticker_pack_dialog, null);
+            View v = LayoutInflater.from(builder.getContext()).inflate(R.layout.dialog_no_sticker_pack, null);
 
             builder
                     .setView(v)

vector/src/main/java/im/vector/adapters/MediaPreviewAdapter.java

@@ -49,7 +49,7 @@ public int getItemCount() {
     @NonNull
     @Override
     public MediaItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.media_preview, parent, false);
+        final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.adapter_item_media_preview, parent, false);
         return new MediaItemViewHolder(view);
     }
 

vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java

@@ -281,7 +281,7 @@ public VectorMessagesAdapter(MXSession session, Context context, MXMediasCache m
                 R.layout.adapter_item_vector_message_emoji,
                 R.layout.adapter_item_vector_message_code,
                 R.layout.adapter_item_vector_message_image_video,
-                R.layout.adapter_item_vector_hidden_message,
+                R.layout.adapter_item_vector_message_redact,
                 R.layout.adapter_item_vector_message_room_versioned,
                 mediasCache);
     }

vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java

@@ -62,7 +62,7 @@ public VectorSearchMessagesListAdapter(MXSession session, Context context, boole
                 R.layout.adapter_item_vector_message_emoji,
                 R.layout.adapter_item_vector_message_code,
                 R.layout.adapter_item_vector_message_image_video,
-                R.layout.adapter_item_vector_hidden_message,
+                R.layout.adapter_item_vector_message_redact,
                 R.layout.adapter_item_vector_message_room_versioned,
                 mediasCache);
 

vector/src/main/res/layout/activity_vector_medias_picker.xml → vector/src/main/res/layout/activity_vector_media_picker.xml

@@ -66,9 +66,9 @@
                     android:id="@+id/medias_picker_switch_camera"
                     android:layout_width="46dp"
                     android:layout_height="46dp"
-                    android:layout_alignEnd="@+id/medias_picker_texture_view"
-                    android:layout_alignRight="@+id/medias_picker_texture_view"
                     android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
                     android:layout_marginTop="12dp"
                     android:layout_marginEnd="12dp"
                     android:layout_marginRight="12dp"