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.
staging
Mihai Adrian 5 years ago committed by Sawyer Blatz
parent 3a21540ff2
commit 33b49ff7fd

@ -98,6 +98,7 @@ import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
import org.mozilla.fenix.utils.FragmentPreDrawManager import org.mozilla.fenix.utils.FragmentPreDrawManager
import org.mozilla.fenix.utils.allowUndo import org.mozilla.fenix.utils.allowUndo
import org.mozilla.fenix.whatsnew.WhatsNew import org.mozilla.fenix.whatsnew.WhatsNew
import kotlin.math.min
@SuppressWarnings("TooManyFunctions", "LargeClass") @SuppressWarnings("TooManyFunctions", "LargeClass")
class HomeFragment : Fragment() { class HomeFragment : Fragment() {
@ -612,10 +613,13 @@ class HomeFragment : Fragment() {
context?.let { context?.let {
val layout = LayoutInflater.from(it) val layout = LayoutInflater.from(it)
.inflate(R.layout.pbm_shortcut_popup, null) .inflate(R.layout.pbm_shortcut_popup, null)
val trackingOnboarding = val privateBrowsingRecommend =
PopupWindow( PopupWindow(
layout, 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, LinearLayout.LayoutParams.WRAP_CONTENT,
true true
) )
@ -623,19 +627,20 @@ class HomeFragment : Fragment() {
setOnClickListener { setOnClickListener {
context.metrics.track(Event.PrivateBrowsingAddShortcutCFR) context.metrics.track(Event.PrivateBrowsingAddShortcutCFR)
PrivateShortcutCreateManager.createPrivateShortcut(context) PrivateShortcutCreateManager.createPrivateShortcut(context)
trackingOnboarding.dismiss() privateBrowsingRecommend.dismiss()
} }
} }
layout.findViewById<Button>(R.id.cfr_neg_button).apply { layout.findViewById<Button>(R.id.cfr_neg_button).apply {
setOnClickListener { setOnClickListener {
context.metrics.track(Event.PrivateBrowsingCancelCFR) context.metrics.track(Event.PrivateBrowsingCancelCFR)
trackingOnboarding.dismiss() privateBrowsingRecommend.dismiss()
} }
} }
// We want to show the popup only after privateBrowsingButton is available. // We want to show the popup only after privateBrowsingButton is available.
// Otherwise, we will encounter an activity token error. // Otherwise, we will encounter an activity token error.
privateBrowsingButton.post { 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)
} }
} }
} }

Loading…
Cancel
Save