Revert "Bug 1845235 - Add "Private" label to Felt Privacy mode home screen"

This reverts commit a4d9aa5b310b4f623979882fc78495defa595a98.

(cherry picked from commit 23ead505c384807afa64706a65a12a4e7c0a0cf6)

app/src/main/res/layout/fragment_home.xml

@@ -75,10 +75,10 @@
                 <ImageView
                     android:id="@+id/wordmarkText"
                     android:layout_width="wrap_content"
-                    android:layout_height="?fenixWordmarkTextHeight"
+                    android:layout_height="@dimen/wordmark_text_height"
                     android:adjustViewBounds="true"
                     android:contentDescription="@null"
-                    android:layout_marginTop="?fenixWordmarkTextMarginTop"
+                    android:layout_marginTop="@dimen/wordmark_text_margin_top"
                     app:srcCompat="?fenixWordmarkText" />
             </LinearLayout>
 

app/src/main/res/values/attrs.xml

@@ -69,8 +69,6 @@
     <attr name="fenixLogo" format="reference" />
     <attr name="fenixWordmarkText" format="reference" />
     <attr name="fenixWordmarkLogo" format="reference" />
-    <attr name="fenixWordmarkTextHeight" format="reference"/>
-    <attr name="fenixWordmarkTextMarginTop" format="reference"/>
     <attr name="toolbarStartGradient" format="reference"/>
     <attr name="toolbarCenterGradient" format="reference"/>
     <attr name="toolbarEndGradient" format="reference"/>

app/src/main/res/values/dimens.xml

@@ -78,8 +78,6 @@
     <dimen name="home_item_vertical_margin">8dp</dimen>
     <dimen name="wordmark_text_height">18dp</dimen>
     <dimen name="wordmark_text_margin_top">10dp</dimen>
-    <dimen name="wordmark_text_height_felt_privacy">32dp</dimen>
-    <dimen name="wordmark_text_margin_top_felt_privacy">4dp</dimen>
 
     <!-- Browser Fragment -->
     <!--The size of the gap between the tab preview and content layout.-->

app/src/main/res/values/styles.xml

@@ -126,8 +126,6 @@
         <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
         <item name="fenixWordmarkText">@drawable/ic_wordmark_text_normal</item>
         <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>
-        <item name="fenixWordmarkTextHeight">@dimen/wordmark_text_height</item>
-        <item name="fenixWordmarkTextMarginTop">@dimen/wordmark_text_margin_top</item>
         <item name="homeBackground">@color/fx_mobile_layer_color_1</item>
         <item name="bottomBarBackground">@drawable/home_bottom_bar_background</item>
         <item name="bottomBarBackgroundTop">@drawable/home_bottom_bar_background_top</item>
@@ -319,8 +317,6 @@
         <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>
         <item name="fenixWordmarkText">@drawable/ic_wordmark_text_private</item>
         <item name="fenixWordmarkLogo">@drawable/ic_wordmark_logo</item>
-        <item name="fenixWordmarkTextHeight">@dimen/wordmark_text_height</item>
-        <item name="fenixWordmarkTextMarginTop">@dimen/wordmark_text_margin_top</item>
         <item name="homeBackground">@drawable/private_home_background_gradient</item>
         <item name="bottomBarBackground">@drawable/private_home_bottom_bar_background_gradient</item>
         <item name="bottomBarBackgroundTop">@drawable/private_home_bottom_bar_background_gradient_top</item>
@@ -340,9 +336,6 @@
     <style name="PrivateTheme" parent="PrivateThemeBase" />
     <style name="FeltPrivateTheme" parent="PrivateThemeBase">
         <item name="homeBackground">@drawable/felt_private_home_background_gradient</item>
-        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_felt_privacy</item>
-        <item name="fenixWordmarkTextHeight">@dimen/wordmark_text_height_felt_privacy</item>
-        <item name="fenixWordmarkTextMarginTop">@dimen/wordmark_text_margin_top_felt_privacy</item>
     </style>
 
     <!-- Fade animation for theme switching -->