From 33b49ff7fd8a5e4ac42feaef2afa6f7acaded887 Mon Sep 17 00:00:00 2001
From: Mihai Adrian <48995920+mcarare@users.noreply.github.com>
Date: Tue, 26 Nov 2019 20:07:31 +0200
Subject: [PATCH] For #6430 Private browsing hint width should not exceed
 screen dimensions (#6786)

Renamed ambiguous pop-up window name.
Adjusted code to match max line length.
---
 .../java/org/mozilla/fenix/home/HomeFragment.kt   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 95b833c3d..3bb93c1a6 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -98,6 +98,7 @@ import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
 import org.mozilla.fenix.utils.FragmentPreDrawManager
 import org.mozilla.fenix.utils.allowUndo
 import org.mozilla.fenix.whatsnew.WhatsNew
+import kotlin.math.min
 
 @SuppressWarnings("TooManyFunctions", "LargeClass")
 class HomeFragment : Fragment() {
@@ -612,10 +613,13 @@ class HomeFragment : Fragment() {
         context?.let {
             val layout = LayoutInflater.from(it)
                 .inflate(R.layout.pbm_shortcut_popup, null)
-            val trackingOnboarding =
+            val privateBrowsingRecommend =
                 PopupWindow(
                     layout,
-                    (resources.displayMetrics.widthPixels / CFR_WIDTH_DIVIDER).toInt(),
+                    min(
+                        (resources.displayMetrics.widthPixels / CFR_WIDTH_DIVIDER).toInt(),
+                        (resources.displayMetrics.heightPixels / CFR_WIDTH_DIVIDER).toInt()
+                    ),
                     LinearLayout.LayoutParams.WRAP_CONTENT,
                     true
                 )
@@ -623,19 +627,20 @@ class HomeFragment : Fragment() {
                 setOnClickListener {
                     context.metrics.track(Event.PrivateBrowsingAddShortcutCFR)
                     PrivateShortcutCreateManager.createPrivateShortcut(context)
-                    trackingOnboarding.dismiss()
+                    privateBrowsingRecommend.dismiss()
                 }
             }
             layout.findViewById<Button>(R.id.cfr_neg_button).apply {
                 setOnClickListener {
                     context.metrics.track(Event.PrivateBrowsingCancelCFR)
-                    trackingOnboarding.dismiss()
+                    privateBrowsingRecommend.dismiss()
                 }
             }
             // We want to show the popup only after privateBrowsingButton is available.
             // Otherwise, we will encounter an activity token error.
             privateBrowsingButton.post {
-                trackingOnboarding.showAsDropDown(privateBrowsingButton, 0, CFR_Y_OFFSET, Gravity.TOP or Gravity.END)
+                privateBrowsingRecommend.showAsDropDown(
+                    privateBrowsingButton, 0, CFR_Y_OFFSET, Gravity.TOP or Gravity.END)
             }
         }
     }