forked from mirrors/gecko-dev
Bug 1892019 - Update Toolbar2 naming to match component name r=android-reviewers,gl
Differential Revision: https://phabricator.services.mozilla.com/D208038
This commit is contained in:
Roger Yang
parent
2e95c8e63e
commit
51175e7bb9
26 changed files with 91 additions and 62 deletions
|
|
@ -270,6 +270,33 @@ projects:
|
|||
- ui-colors
|
||||
- ui-icons
|
||||
- ui-widgets
|
||||
browser-toolbar2:
|
||||
description: A customizable toolbar for browsers.
|
||||
path: components/browser/toolbar2
|
||||
publish: true
|
||||
upstream_dependencies:
|
||||
- browser-errorpages
|
||||
- browser-menu
|
||||
- browser-menu2
|
||||
- browser-state
|
||||
- concept-awesomebar
|
||||
- concept-base
|
||||
- concept-engine
|
||||
- concept-fetch
|
||||
- concept-menu
|
||||
- concept-storage
|
||||
- concept-toolbar
|
||||
- lib-publicsuffixlist
|
||||
- lib-state
|
||||
- support-base
|
||||
- support-ktx
|
||||
- support-test
|
||||
- support-utils
|
||||
- tooling-lint
|
||||
- ui-autocomplete
|
||||
- ui-colors
|
||||
- ui-icons
|
||||
- ui-widgets
|
||||
compose-awesomebar:
|
||||
description: An awesomebar component showing search results matching text entered
|
||||
into the toolbar.
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ High-level components for building browser(-like) apps.
|
|||
|
||||
* 🔵 [**Toolbar**](components/browser/toolbar/README.md) - A customizable toolbar for browsers.
|
||||
|
||||
* 🔴 [**Toolbar2**](components/browser/toolbar2/README.md) - A customizable toolbar for browsers.
|
||||
|
||||
## Concept
|
||||
|
||||
_API contracts and abstraction layers for browser components._
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# [Android Components](../../../README.md) > Browser > Toolbar
|
||||
# [Android Components](../../../README.md) > Browser > Toolbar2
|
||||
|
||||
A customizable toolbar for browsers.
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ A customizable toolbar for browsers.
|
|||
Use Gradle to download the library from [maven.mozilla.org](https://maven.mozilla.org/) ([Setup repository](../../../README.md#maven-repository)):
|
||||
|
||||
```Groovy
|
||||
implementation "org.mozilla.components:browser-toolbar:{latest-version}"
|
||||
implementation "org.mozilla.components:browser-toolbar2:{latest-version}"
|
||||
```
|
||||
|
||||
## Facts
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ android {
|
|||
}
|
||||
}
|
||||
|
||||
namespace 'mozilla.components.browser.toolbar'
|
||||
namespace 'mozilla.components.browser.toolbar2'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar
|
||||
package mozilla.components.browser.toolbar2
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.drawable.Drawable
|
||||
|
|
@ -25,8 +25,8 @@ import kotlinx.coroutines.Dispatchers
|
|||
import kotlinx.coroutines.cancelChildren
|
||||
import kotlinx.coroutines.isActive
|
||||
import kotlinx.coroutines.launch
|
||||
import mozilla.components.browser.toolbar.display.DisplayToolbar
|
||||
import mozilla.components.browser.toolbar.edit.EditToolbar
|
||||
import mozilla.components.browser.toolbar2.display.DisplayToolbar
|
||||
import mozilla.components.browser.toolbar2.edit.EditToolbar
|
||||
import mozilla.components.concept.toolbar.AutocompleteDelegate
|
||||
import mozilla.components.concept.toolbar.AutocompleteResult
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
|
|
@ -21,9 +21,9 @@ import androidx.constraintlayout.widget.ConstraintSet
|
|||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.view.isVisible
|
||||
import mozilla.components.browser.menu.BrowserMenuBuilder
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar.internal.ActionContainer
|
||||
import mozilla.components.browser.toolbar2.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.browser.toolbar2.internal.ActionContainer
|
||||
import mozilla.components.concept.menu.MenuController
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
import mozilla.components.support.ktx.android.content.isScreenReaderEnabled
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Canvas
|
||||
|
|
@ -10,7 +10,7 @@ import android.util.AttributeSet
|
|||
import android.view.View
|
||||
import android.widget.ImageView
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
|
||||
/**
|
||||
* Custom ConstraintLayout for DisplayToolbar that allows us to draw ripple backgrounds on the toolbar
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.drawable.Drawable
|
||||
|
|
@ -11,7 +11,7 @@ import androidx.annotation.VisibleForTesting
|
|||
import androidx.appcompat.content.res.AppCompatResources
|
||||
import androidx.appcompat.widget.AppCompatImageView
|
||||
import androidx.core.view.isVisible
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.concept.toolbar.Toolbar.Highlight
|
||||
import mozilla.components.concept.toolbar.Toolbar.Highlight.NONE
|
||||
import mozilla.components.concept.toolbar.Toolbar.Highlight.PERMISSIONS_CHANGED
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import androidx.annotation.ColorInt
|
||||
import androidx.annotation.VisibleForTesting
|
||||
|
|
@ -10,7 +10,7 @@ import androidx.core.view.isVisible
|
|||
import mozilla.components.browser.menu.BrowserMenuBuilder
|
||||
import mozilla.components.browser.menu.ext.asCandidateList
|
||||
import mozilla.components.browser.menu.ext.getHighlight
|
||||
import mozilla.components.browser.toolbar.facts.emitOpenMenuFact
|
||||
import mozilla.components.browser.toolbar2.facts.emitOpenMenuFact
|
||||
import mozilla.components.concept.menu.MenuController
|
||||
|
||||
internal class MenuButton(
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.animation.LayoutTransition
|
||||
import android.content.Context
|
||||
|
|
@ -15,8 +15,8 @@ import android.widget.LinearLayout
|
|||
import android.widget.TextView
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.core.view.isVisible
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
|
||||
private const val TITLE_VIEW_WEIGHT = 5.7f
|
||||
private const val URL_VIEW_WEIGHT = 4.3f
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.content.Context
|
||||
import android.util.AttributeSet
|
||||
import android.view.View
|
||||
import androidx.appcompat.widget.AppCompatImageView
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.concept.toolbar.Toolbar.SiteSecurity
|
||||
|
||||
/**
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.drawable.Animatable
|
||||
|
|
@ -13,7 +13,7 @@ import androidx.annotation.VisibleForTesting
|
|||
import androidx.appcompat.content.res.AppCompatResources
|
||||
import androidx.appcompat.widget.AppCompatImageView
|
||||
import androidx.core.view.isVisible
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.concept.toolbar.Toolbar.SiteTrackingProtection
|
||||
import mozilla.components.concept.toolbar.Toolbar.SiteTrackingProtection.OFF_FOR_A_SITE
|
||||
import mozilla.components.concept.toolbar.Toolbar.SiteTrackingProtection.OFF_GLOBALLY
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.edit
|
||||
package mozilla.components.browser.toolbar2.edit
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Typeface
|
||||
|
|
@ -22,11 +22,11 @@ import androidx.core.view.isVisible
|
|||
import kotlinx.coroutines.CoroutineExceptionHandler
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.asCoroutineDispatcher
|
||||
import mozilla.components.browser.toolbar.AsyncFilterListener
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar.facts.emitCommitFact
|
||||
import mozilla.components.browser.toolbar.internal.ActionContainer
|
||||
import mozilla.components.browser.toolbar2.AsyncFilterListener
|
||||
import mozilla.components.browser.toolbar2.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.browser.toolbar2.facts.emitCommitFact
|
||||
import mozilla.components.browser.toolbar2.internal.ActionContainer
|
||||
import mozilla.components.concept.toolbar.AutocompleteDelegate
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
import mozilla.components.support.base.log.logger.Logger
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.facts
|
||||
package mozilla.components.browser.toolbar2.facts
|
||||
|
||||
import mozilla.components.support.base.Component
|
||||
import mozilla.components.support.base.facts.Action
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.internal
|
||||
package mozilla.components.browser.toolbar2.internal
|
||||
|
||||
import android.content.Context
|
||||
import android.transition.TransitionManager
|
||||
|
|
@ -12,7 +12,7 @@ import android.view.View
|
|||
import android.widget.LinearLayout
|
||||
import androidx.annotation.VisibleForTesting
|
||||
import androidx.core.view.isVisible
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
|
||||
/**
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.internal
|
||||
package mozilla.components.browser.toolbar2.internal
|
||||
|
||||
import android.view.View
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
<mozilla.components.browser.toolbar.display.DisplayToolbarView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<mozilla.components.browser.toolbar2.display.DisplayToolbarView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:mozac="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
<!-- Navigation -->
|
||||
|
||||
<mozilla.components.browser.toolbar.internal.ActionContainer
|
||||
<mozilla.components.browser.toolbar2.internal.ActionContainer
|
||||
android:id="@+id/mozac_browser_toolbar_navigation_actions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dp"
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
app:srcCompat="@drawable/mozac_ic_search_24"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<mozilla.components.browser.toolbar.display.TrackingProtectionIconView
|
||||
<mozilla.components.browser.toolbar2.display.TrackingProtectionIconView
|
||||
android:id="@+id/mozac_browser_toolbar_tracking_protection_indicator"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/mozac_browser_toolbar_icons_vertical_separator" />
|
||||
|
||||
<mozilla.components.browser.toolbar.display.SiteSecurityIconView
|
||||
<mozilla.components.browser.toolbar2.display.SiteSecurityIconView
|
||||
android:id="@+id/mozac_browser_toolbar_security_indicator"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/mozac_ic_site_security" />
|
||||
|
||||
<mozilla.components.browser.toolbar.display.HighlightView
|
||||
<mozilla.components.browser.toolbar2.display.HighlightView
|
||||
android:id="@+id/mozac_browser_toolbar_permission_indicator"
|
||||
android:layout_width="10dp"
|
||||
android:layout_height="10dp"
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
|
||||
<!-- URL & Title -->
|
||||
|
||||
<mozilla.components.browser.toolbar.display.OriginView
|
||||
<mozilla.components.browser.toolbar2.display.OriginView
|
||||
android:id="@+id/mozac_browser_toolbar_origin_view"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="40dp"
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
|
||||
<!-- Page actions -->
|
||||
|
||||
<mozilla.components.browser.toolbar.internal.ActionContainer
|
||||
<mozilla.components.browser.toolbar2.internal.ActionContainer
|
||||
android:id="@+id/mozac_browser_toolbar_page_actions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dp"
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
|
||||
<!-- Browser Actions -->
|
||||
|
||||
<mozilla.components.browser.toolbar.internal.ActionContainer
|
||||
<mozilla.components.browser.toolbar2.internal.ActionContainer
|
||||
android:id="@+id/mozac_browser_toolbar_browser_actions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dp"
|
||||
|
|
@ -172,4 +172,4 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</mozilla.components.browser.toolbar.display.DisplayToolbarView>
|
||||
</mozilla.components.browser.toolbar2.display.DisplayToolbarView>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
tools:ignore="ContentDescription"
|
||||
android:layout_marginTop="8dp" />
|
||||
|
||||
<mozilla.components.browser.toolbar.internal.ActionContainer
|
||||
<mozilla.components.browser.toolbar2.internal.ActionContainer
|
||||
android:id="@+id/mozac_browser_toolbar_edit_actions_start"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
app:layout_constraintEnd_toStartOf="@id/mozac_browser_toolbar_edit_actions_end"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<mozilla.components.browser.toolbar.internal.ActionContainer
|
||||
<mozilla.components.browser.toolbar2.internal.ActionContainer
|
||||
android:id="@+id/mozac_browser_toolbar_edit_actions_end"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar
|
||||
package mozilla.components.browser.toolbar2
|
||||
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.asCoroutineDispatcher
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar
|
||||
package mozilla.components.browser.toolbar2
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.drawable.Drawable
|
||||
|
|
@ -17,10 +17,10 @@ import androidx.core.view.inputmethod.EditorInfoCompat
|
|||
import androidx.core.view.isGone
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import mozilla.components.browser.toolbar.display.DisplayToolbar
|
||||
import mozilla.components.browser.toolbar.display.DisplayToolbarViews
|
||||
import mozilla.components.browser.toolbar.display.MenuButton
|
||||
import mozilla.components.browser.toolbar.edit.EditToolbar
|
||||
import mozilla.components.browser.toolbar2.display.DisplayToolbar
|
||||
import mozilla.components.browser.toolbar2.display.DisplayToolbarViews
|
||||
import mozilla.components.browser.toolbar2.display.MenuButton
|
||||
import mozilla.components.browser.toolbar2.edit.EditToolbar
|
||||
import mozilla.components.concept.toolbar.AutocompleteDelegate
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
import mozilla.components.concept.toolbar.Toolbar.SiteSecurity
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.graphics.Color
|
||||
import android.os.Build
|
||||
|
|
@ -14,8 +14,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
|
|||
import mozilla.components.browser.menu.BrowserMenu
|
||||
import mozilla.components.browser.menu.BrowserMenuBuilder
|
||||
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.concept.menu.MenuButton
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
import mozilla.components.concept.toolbar.Toolbar.SiteSecurity
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.concept.toolbar.Toolbar.Highlight.NONE
|
||||
import mozilla.components.concept.toolbar.Toolbar.Highlight.PERMISSIONS_CHANGED
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.graphics.Color
|
||||
import android.view.View
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.display
|
||||
package mozilla.components.browser.toolbar2.display
|
||||
|
||||
import android.graphics.PorterDuff
|
||||
import android.graphics.PorterDuffColorFilter
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.edit
|
||||
package mozilla.components.browser.toolbar2.edit
|
||||
|
||||
import android.view.KeyEvent
|
||||
import android.view.View
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar.R
|
||||
import mozilla.components.browser.toolbar2.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar2.R
|
||||
import mozilla.components.concept.toolbar.AutocompleteDelegate
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
import mozilla.components.support.base.Component
|
||||
|
|
@ -2,10 +2,10 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package mozilla.components.browser.toolbar.internal
|
||||
package mozilla.components.browser.toolbar2.internal
|
||||
|
||||
import android.view.View
|
||||
import mozilla.components.browser.toolbar.BrowserToolbar
|
||||
import mozilla.components.browser.toolbar2.BrowserToolbar
|
||||
import mozilla.components.concept.toolbar.Toolbar
|
||||
import mozilla.components.support.test.robolectric.testContext
|
||||
import org.junit.Assert.assertEquals
|
||||
Loading…
Reference in a new issue