[QRCode Android] UI fixes for camera permission view

Bug: 1084787
Change-Id: Iba082a91843becfb0080fc22029fa8a518e3d73e
Tbr: tiborg@chromium.org for lint suppression
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2211065
Commit-Queue: Gayane Petrosyan <gayane@chromium.org>
Reviewed-by: Tanya Gupta <tgupta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771015}

build/android/lint/suppressions.xml

@@ -476,25 +476,25 @@ Still reading?
     <!--TODO(crbug.com/1052375): Remove this suppression once ConnectionInfoPopAndroid moves to components.-->
     <ignore regexp="components/page_info/android/java/res/drawable-hdpi/pageinfo_*"/>
     <!--TODO(crbug.com/1052375): Remove this suppression once PermissionParamsListBuilder moves to components.-->
-    <ignore regexp="The resource `R.string.page_info_permission_ads_subtitle` appears to be unused" />
+    <ignore regexp="The resource `R.string.page_info_permission_ads_subtitle` appears to be unused"/>
     <!--TODO(crbug.com/1069186): The following 12 are found when we switched to linting the entire app. -->
-    <ignore regexp="The resource `R.string.download_manager_ui_documents` appears to be unused" />
-    <ignore regexp="The resource `R.string.download_manager_offline_home` appears to be unused" />
-    <ignore regexp="The resource `R.string.ntp_learn_more_about_suggested_content` appears to be unused" />
-    <ignore regexp="The resource `R.string.ntp_feed_menu_iph` appears to be unused" />
-    <ignore regexp="The resource `R.string.tab_switcher_button_label` appears to be unused" />
-    <ignore regexp="The resource `R.string.prefs_autofill_assistant_switch` appears to be unused" />
-    <ignore regexp="The resource `R.string.storage_clear_dialog_text` appears to be unused" />
-    <ignore regexp="The resource `R.string.website_settings_category_notifications_block` appears to be unused" />
-    <ignore regexp="The resource `R.string.autofill_cc_google_issued` appears to be unused" />
-    <ignore regexp="The resource `R.string.notification_manage_button` appears to be unused" />
-    <ignore regexp="The resource `R.string.app_banner_add` appears to be unused" />
-    <ignore regexp="The resource `R.string.notification_category_permission_requests` appears to be unused" />
-    <ignore regexp="The resource `R.drawable.ic_launcher_background` appears to be unused" />
-    <ignore regexp="The resource `R.string.combined_notification_text` appears to be unused" />
-    <ignore regexp="The resource `R.plurals.public_notification_text` appears to be unused" />
-    <ignore regexp="The resource `R.mipmap.app_shortcut_icon` appears to be unused" />
-    <ignore regexp="The resource `R.mipmap.app_single_page_icon` appears to be unused" />
+    <ignore regexp="The resource `R.string.download_manager_ui_documents` appears to be unused"/>
+    <ignore regexp="The resource `R.string.download_manager_offline_home` appears to be unused"/>
+    <ignore regexp="The resource `R.string.ntp_learn_more_about_suggested_content` appears to be unused"/>
+    <ignore regexp="The resource `R.string.ntp_feed_menu_iph` appears to be unused"/>
+    <ignore regexp="The resource `R.string.tab_switcher_button_label` appears to be unused"/>
+    <ignore regexp="The resource `R.string.prefs_autofill_assistant_switch` appears to be unused"/>
+    <ignore regexp="The resource `R.string.storage_clear_dialog_text` appears to be unused"/>
+    <ignore regexp="The resource `R.string.website_settings_category_notifications_block` appears to be unused"/>
+    <ignore regexp="The resource `R.string.autofill_cc_google_issued` appears to be unused"/>
+    <ignore regexp="The resource `R.string.notification_manage_button` appears to be unused"/>
+    <ignore regexp="The resource `R.string.app_banner_add` appears to be unused"/>
+    <ignore regexp="The resource `R.string.notification_category_permission_requests` appears to be unused"/>
+    <ignore regexp="The resource `R.drawable.ic_launcher_background` appears to be unused"/>
+    <ignore regexp="The resource `R.string.combined_notification_text` appears to be unused"/>
+    <ignore regexp="The resource `R.plurals.public_notification_text` appears to be unused"/>
+    <ignore regexp="The resource `R.mipmap.app_shortcut_icon` appears to be unused"/>
+    <ignore regexp="The resource `R.mipmap.app_single_page_icon` appears to be unused"/>
     <!-- Endnote: Please specify number of suppressions when adding more -->
   </issue>
   <issue id="UsableSpace">
@@ -507,6 +507,8 @@ Still reading?
   <issue id="UseCompoundDrawables">
     <!-- Upscaling 24dp to 48dp doesn't work as expected with a TextView compound drawable. -->
     <ignore regexp="chrome/android/java/res/layout/photo_picker_bitmap_view.xml"/>
+    <!-- Cannot add image to textview as the image is supplied through @style/TabBarShadow. -->
+    <ignore regexp="chrome/browser/share/android/java/res/layout/qrcode_camera_error_layout.xml"/>
   </issue>
   <!-- TODO(crbug.com/807734): Investigate and possible remove this -->
   <issue id="UseSparseArrays" severity="ignore"/>

chrome/browser/share/android/java/res/layout/qrcode_camera_error_layout.xml

@@ -7,15 +7,22 @@
     android:id="@+id/permission_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center"
     android:orientation="vertical">
+    <ImageView
+        android:id="@+id/tab_line"
+        android:layout_width="match_parent"
+        style="@style/TabBarShadow"
+        android:importantForAccessibility="no"/>
+
   <TextView
       android:id="@+id/qrcode_camera_error_text"
-      android:layout_width="wrap_content"
+      android:layout_width="250dp"
       android:layout_height="wrap_content"
+      android:layout_marginTop="250dp"
       android:drawablePadding="8dp"
       android:drawableStart="@drawable/ic_error"
-      android:gravity="center_vertical"
+      android:gravity="center_horizontal"
+      android:layout_gravity="center_horizontal"
       android:maxWidth="250dp"
       android:textAppearance="@style/TextAppearance.ErrorCaption" />
 </LinearLayout>

chrome/browser/share/android/java/res/layout/qrcode_open_settings_layout.xml

@@ -9,9 +9,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+    <ImageView
+        android:id="@+id/tab_line"
+        android:layout_width="match_parent"
+        style="@style/TabBarShadow"
+        android:importantForAccessibility="no"/>
+
     <org.chromium.ui.widget.ChromeImageView
         android:id="@+id/camera_icon"
-        android:layout_marginTop="200dp"
+        android:layout_marginTop="112dp"
         android:layout_gravity="center_horizontal"
         android:layout_width="150dp"
         android:layout_height="150dp"

chrome/browser/share/android/java/res/layout/qrcode_permission_layout.xml

@@ -9,9 +9,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+    <ImageView
+        android:id="@+id/tab_line"
+        android:layout_width="match_parent"
+        style="@style/TabBarShadow"
+        android:importantForAccessibility="no"/>
+
     <org.chromium.ui.widget.ChromeImageView
         android:id="@+id/camera_icon"
-        android:layout_marginTop="200dp"
+        android:layout_marginTop="112dp"
         android:layout_gravity="center_horizontal"
         android:layout_width="150dp"
         android:layout_height="150dp"