Skip to content

Commit

Permalink
[components] Closes mozilla-mobile/android-components#1400: Add close…
Browse files Browse the repository at this point in the history
… button to custom tabs

Also makes the toolbar unclickable so it can't be switching into
edit mode, and removes all other actions.

Moved the custom tab back button bitmap checking to the feature from the
CustomTabConfig since we needed to know the DisplayMetrics for the
current screen to properly compare it to the max dp value.

X-Channel-Revision: [main] mozilla-mobile/android-components@96444dd
X-Channel-Revision: [main] mozilla-mobile/fenix@d039188
X-Channel-Revision: [main] mozilla-mobile/focus-android@a9a09b1
X-Channel-Converted-Revision: [main] mozilla-mobile/firefox-android@be9fd3a
  • Loading branch information
jonalmeida committed Jan 21, 2019
1 parent 3b8a0b7 commit 850266a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mozilla-mobile/firefox-android/android-components",
"revs": {
"main": "c4570b5cbff052aef47d89c22179f7fb43df0f56"
"main": "be9fd3a06afb26de96e6e19c2ea0f85dcbcfb083"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="mozac_feature_customtabs_share_dialog_title">Share via</string>
<string name="mozac_feature_customtabs_exit_button">Return to previous app</string>
<string name="mozac_feature_customtabs_share_link">Share link</string>
<string name="mozac_feature_customtabs_share_button">Share</string>
</resources>

0 comments on commit 850266a

Please sign in to comment.