From 0bc5934e083e2e409ed56e5c53dd29fc3740f8c3 Mon Sep 17 00:00:00 2001
From: Harrison Oglesby <oglesby.harrison@gmail.com>
Date: Fri, 8 Sep 2023 10:34:57 -0700
Subject: [PATCH] Revert "Bug 1845235 - Add "Private" label to Felt Privacy
 mode home screen"

This reverts commit a4d9aa5b310b4f623979882fc78495defa595a98.

(cherry picked from commit 23ead505c384807afa64706a65a12a4e7c0a0cf6)
---
 .../drawable/ic_wordmark_text_felt_privacy.png   | Bin 4852 -> 0 bytes
 app/src/main/res/layout/fragment_home.xml        |   4 ++--
 app/src/main/res/values/attrs.xml                |   2 --
 app/src/main/res/values/dimens.xml               |   2 --
 app/src/main/res/values/styles.xml               |   7 -------
 5 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_wordmark_text_felt_privacy.png

diff --git a/app/src/main/res/drawable/ic_wordmark_text_felt_privacy.png b/app/src/main/res/drawable/ic_wordmark_text_felt_privacy.png
deleted file mode 100644
index 42781f8303162089a59485bae1f041622841b1c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4852
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
amE->}Kt%qyCVe#k0000<MNUMnLSTXp_lPwB

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index b58ebb34c..084104c65 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/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>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index fa5394fd2..f65a56c8e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/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"/>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5c3b851c9..4347f6bb5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/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.-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fc5f49a1a..629e9227a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/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 -->