fix for incorrect times during Send creation (#1313 )

New Crowdin updates (#1312 )
* New translations AppResources.resx (Romanian) * New translations AppResources.resx (Slovak) * New translations AppResources.resx (Latvian) * New translations AppResources.resx (Estonian) * New translations AppResources.resx (Persian) * New translations AppResources.resx (Portuguese, Brazilian) * New translations AppResources.resx (Chinese Traditional) * New translations AppResources.resx (Chinese Simplified) * New translations AppResources.resx (Ukrainian) * New translations AppResources.resx (Turkish) * New translations AppResources.resx (Serbian (Cyrillic)) * New translations AppResources.resx (Russian) * New translations AppResources.resx (Catalan) * New translations AppResources.resx (Polish) * New translations AppResources.resx (Dutch) * New translations AppResources.resx (Korean) * New translations AppResources.resx (Japanese) * New translations AppResources.resx (Italian) * New translations AppResources.resx (Hungarian) * New translations AppResources.resx (Finnish) * New translations AppResources.resx (Danish) * New translations AppResources.resx (Czech)
2025-12-05 23:53:33 +00:00 · 2021-03-11 20:52:35 -05:00 · 2021-03-11 13:52:50 -05:00 · 2021-03-11 12:12:41 -05:00 · 2021-03-11 11:47:32 -05:00 · 2021-03-11 10:34:22 -05:00
589 changed files with 40702 additions and 5531 deletions
--- a/.github/resources/export-options-ad-hoc.plist
+++ b/.github/resources/export-options-ad-hoc.plist
@@ -7,11 +7,11 @@
    <key>provisioningProfiles</key>
    <dict>
        <key>com.8bit.bitwarden</key>
-        <string>Ad hoc: Bitwarden 2020</string>
+        <string>Ad hoc: Bitwarden 2021</string>
        <key>com.8bit.bitwarden.autofill</key>
-        <string>Ad hoc: Autofill 2020</string>
+        <string>Ad hoc: Autofill 2021</string>
        <key>com.8bit.bitwarden.find-login-action-extension</key>
-        <string>Ad hoc: Extension 2020</string>
+        <string>Ad hoc: Extension 2021</string>
    </dict>
 </dict>
 </plist>
--- a/.github/resources/export-options-app-store.plist
+++ b/.github/resources/export-options-app-store.plist
@@ -7,11 +7,11 @@
    <key>provisioningProfiles</key>
    <dict>
        <key>com.8bit.bitwarden</key>
-        <string>Dist: Bitwarden 2020</string>
+        <string>Dist: Bitwarden 2021</string>
        <key>com.8bit.bitwarden.autofill</key>
-        <string>Dist: Autofill 2020</string>
+        <string>Dist: Autofill 2021</string>
        <key>com.8bit.bitwarden.find-login-action-extension</key>
-        <string>Dist: Extension 2020</string>
+        <string>Dist: Extension 2021</string>
    </dict>
 </dict>
 </plist>
--- a/.github/scripts/android/deploy-play.ps1
+++ b/.github/scripts/android/deploy-play.ps1
@@ -4,6 +4,6 @@ $homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path;
 $publisherPath = $($rootPath + "/store/google/Publisher/bin/Release/netcoreapp2.0/Publisher.dll");
 $credsPath = $($homePath + "/secrets/play_creds.json");
 $aabPath = $($rootPath + "/com.x8bit.bitwarden.aab");
-$track = "alpha";
+$track = "internal";

 dotnet $publisherPath $credsPath $aabPath $track
--- a/.github/secrets/bitwarden-mobile-key.p12.gpg
+++ b/.github/secrets/bitwarden-mobile-key.p12.gpg
--- a/.github/secrets/dist_autofill.mobileprovision.gpg
+++ b/.github/secrets/dist_autofill.mobileprovision.gpg
--- a/.github/secrets/dist_bitwarden.mobileprovision.gpg
+++ b/.github/secrets/dist_bitwarden.mobileprovision.gpg
--- a/.github/secrets/dist_extension.mobileprovision.gpg
+++ b/.github/secrets/dist_extension.mobileprovision.gpg
--- a/.github/secrets/iphone-distribution-cert.p12.gpg
+++ b/.github/secrets/iphone-distribution-cert.p12.gpg
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,13 +30,8 @@ jobs:
    runs-on: windows-latest

    steps:
-      - name: Set up NuGet
-        uses: nuget/setup-nuget@v1
-        with:
-          nuget-version: 'latest'
-
      - name: Set up MSBuild
-        uses: microsoft/setup-msbuild@v1.0.0
+        uses: microsoft/setup-msbuild@v1

      - name: Print environment
        run: |
@@ -68,6 +63,9 @@ jobs:
      - name: Restore packages
        run: nuget restore

+      - name: Run Core Tests
+        run: dotnet test test/Core.Test/Core.Test.csproj
+
      - name: Build Play Store publisher
        run: dotnet build ./store/google/Publisher/Publisher.csproj -p:Configuration=Release

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,31 @@
-Code contributions are welcome! Please commit any pull requests against the `master` branch.
+# How to Contribute
+
+Contributions of all kinds are welcome!
+
+Please visit our [Community Forums](https://community.bitwarden.com/) for general community discussion and the development roadmap.
+
+Here is how you can get involved:
+
+* **Request a new feature:** Go to the [Feature Requests category](https://community.bitwarden.com/c/feature-requests/) of the Community Forums. Please search existing feature requests before making a new one
+  
+* **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code
+  
+* **Report a bug or submit a bugfix:** Use Github issues and pull requests
+  
+* **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
+  
+* **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
+  
+* **Translate:** See the localization (i10n) section below
+
+## Contributor Agreement
+
+Please sign the [Contributor Agreement](https://cla-assistant.io/bitwarden/mobile) if you intend on contributing to any Github repository. Pull requests cannot be accepted and merged unless the author has signed the Contributor Agreement.
+
+## Pull Request Guidelines
+
+* commit any pull requests against the `master` branch
+* include a link to your Community Forums post

 # Localization (l10n)

--- a/bitwarden-mobile.sln
+++ b/bitwarden-mobile.sln
@@ -41,6 +41,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Extension", "src\iOS.Ex
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Autofill", "src\iOS.Autofill\iOS.Autofill.csproj", "{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "test\Common\Common.csproj", "{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Test", "test\Core.Test\Core.Test.csproj", "{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -351,6 +355,66 @@ Global
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhone.Build.0 = Release|iPhone
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhone.Build.0 = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.FDroid|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhone.Build.0 = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -366,6 +430,8 @@ Global
 		{599E0201-420A-4C3E-A7BA-5349F72E0B15} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{324BE76C-38FA-4F11-8BB1-95C7B3B1B545} = {D10CA4A9-F866-40E1-B658-F69051236C71}
 		{8A3ECD75-3EC8-4CB3-B3A2-A73A724C279A} = {D10CA4A9-F866-40E1-B658-F69051236C71}
+		{4085B0A5-12A9-4993-B8B8-4ACE72E62E39} = {8904C536-C67D-420F-9971-51B26574C3AA}
+		{8AE548D9-A567-4E97-995E-93EC7DB0FDE0} = {8904C536-C67D-420F-9971-51B26574C3AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7D436EA3-8B7E-45D2-8D14-0730BD2E0410}
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -9,6 +9,7 @@ files:
        pt-PT: pt-PT
        pt-BR: pt-BR
        en-GB: en-GB
+        en-IN: en-IN
  - source: /store/apple/en/copy.resx
    translation: /store/apple/%two_letters_code%/copy.resx
    update_option: update_as_unapproved
@@ -19,6 +20,7 @@ files:
        pt-PT: pt-PT
        pt-BR: pt-BR
        en-GB: en-GB
+        en-IN: en-IN
  - source: /store/google/en/copy.resx
    translation: /store/google/%two_letters_code%/copy.resx
    update_option: update_as_unapproved
@@ -29,3 +31,4 @@ files:
        pt-BR: pt-BR
        pt-PT: pt-PT
        en-GB: en-GB
+        en-IN: en-IN
--- a/src/Android/Accessibility/AccessibilityHelpers.cs
+++ b/src/Android/Accessibility/AccessibilityHelpers.cs
@@ -31,9 +31,11 @@ namespace Bit.Droid.Accessibility
            // So keep them in sync with:
            //   - AutofillHelpers.{TrustedBrowsers,CompatBrowsers}
            //   - Resources/xml/autofillservice.xml
+            new Browser("alook.browser", "search_fragment_input_view"),
            new Browser("com.amazon.cloud9", "url"),
            new Browser("com.android.browser", "url"),
            new Browser("com.android.chrome", "url_bar"),
+            // Rem. for "com.android.htmlviewer": doesn't have a URL bar, therefore not present here.
            new Browser("com.avast.android.secure.browser", "editor"),
            new Browser("com.avg.android.secure.browser", "editor"),
            new Browser("com.brave.browser", "url_bar"),
@@ -50,13 +52,15 @@ namespace Bit.Droid.Accessibility
            new Browser("com.google.android.apps.chrome_dev", "url_bar"),
            new Browser("com.kiwibrowser.browser", "url_bar"),
            new Browser("com.microsoft.emmx", "url_bar"),
+            new Browser("com.mmbox.browser", "search_box"),
+            new Browser("com.mmbox.xbrowser", "search_box"),
            new Browser("com.naver.whale", "url_bar"),
            new Browser("com.opera.browser", "url_field"),
            new Browser("com.opera.browser.beta", "url_field"),
            new Browser("com.opera.mini.native", "url_field"),
            new Browser("com.opera.mini.native.beta", "url_field"),
            new Browser("com.opera.touch", "addressbarEdit"),
-            new Browser("com.qwant.liberty", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
+            new Browser("com.qwant.liberty", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v4)
            new Browser("com.sec.android.app.sbrowser", "location_bar_edit_text"),
            new Browser("com.sec.android.app.sbrowser.beta", "location_bar_edit_text"),
            new Browser("com.stoutner.privacybrowser.free", "url_edittext"),
@@ -66,7 +70,13 @@ namespace Bit.Droid.Accessibility
            new Browser("com.vivaldi.browser.sopranos", "url_bar"),
            new Browser("com.yandex.browser", "bro_omnibar_address_title_text,bro_omnibox_collapsed_title",
                (s) => s.Split(new char[]{' ', ' '}).FirstOrDefault()), // 0 = Regular Space, 1 = No-break space (00A0)
-            new Browser("mark.via.gp", "aw"),
+            new Browser("com.z28j.feel", "g2"),
+            new Browser("idm.internet.download.manager", "search"),
+            new Browser("idm.internet.download.manager.adm.lite", "search"),
+            new Browser("idm.internet.download.manager.plus", "search"),
+            new Browser("io.github.forkmaintainers.iceraven", "mozac_browser_toolbar_url_view"),
+            new Browser("mark.via", "am,an"),
+            new Browser("mark.via.gp", "as"),
            new Browser("org.adblockplus.browser", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
            new Browser("org.adblockplus.browser.beta", "url_bar,url_bar_title"), // 2nd = Legacy (before v2)
            new Browser("org.bromite.bromite", "url_bar"),
@@ -75,18 +85,19 @@ namespace Bit.Droid.Accessibility
            new Browser("org.codeaurora.swe.browser", "url_bar"),
            new Browser("org.gnu.icecat", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
            new Browser("org.mozilla.fenix", "mozac_browser_toolbar_url_view"),
-            new Browser("org.mozilla.fenix.nightly", "mozac_browser_toolbar_url_view"),
-            new Browser("org.mozilla.fennec_aurora", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
-            new Browser("org.mozilla.fennec_fdroid", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
-            new Browser("org.mozilla.firefox", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
+            new Browser("org.mozilla.fenix.nightly", "mozac_browser_toolbar_url_view"), // [DEPRECATED ENTRY]
+            new Browser("org.mozilla.fennec_aurora", "mozac_browser_toolbar_url_view,url_bar_title"), // [DEPRECATED ENTRY]
+            new Browser("org.mozilla.fennec_fdroid", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
+            new Browser("org.mozilla.firefox", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
            new Browser("org.mozilla.firefox_beta", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy
            new Browser("org.mozilla.focus", "display_url"),
            new Browser("org.mozilla.klar", "display_url"),
            new Browser("org.mozilla.reference.browser", "mozac_browser_toolbar_url_view"),
            new Browser("org.mozilla.rocket", "display_url"),
-            new Browser("org.torproject.torbrowser", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
-            new Browser("org.torproject.torbrowser_alpha", "url_bar_title,mozac_browser_toolbar_url_view"), // 2nd = Anticipation
-            new Browser("org.ungoogled.chromium", "url_bar"),
+            new Browser("org.torproject.torbrowser", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v10.0.3)
+            new Browser("org.torproject.torbrowser_alpha", "mozac_browser_toolbar_url_view,url_bar_title"), // 2nd = Legacy (before v10.0a8)
+            new Browser("org.ungoogled.chromium.extensions.stable", "url_bar"),
+            new Browser("org.ungoogled.chromium.stable", "url_bar"),

            // [Section B] Entries only present here
            //
@@ -129,16 +140,197 @@ namespace Bit.Droid.Accessibility
            "com.ss.squarehome2",
            "com.treydev.pns"
        };
-        
-        // Be sure to keep these entries sorted alphabetically
+
+        // Be sure to keep these sections sorted alphabetically
        public static Dictionary<string, KnownUsernameField> KnownUsernameFields => new List<KnownUsernameField>
        {
-            new KnownUsernameField("accounts.google.com", "ServiceLogin", "Email"),
-            new KnownUsernameField("amazon.com", "signin", "ap_email_login"),
-            new KnownUsernameField("github.com", "", "user[login]-footer"),
-            new KnownUsernameField("paypal.com", "signin", "email"),
-            new KnownUsernameField("signin.aws.amazon.com", "signin", "resolving_input"),
-            new KnownUsernameField("signin.ebay.com", "eBayISAPI.dll", "userid"),
+            /**************************************************************************************
+             * SECTION A ——— World-renowned web sites/applications
+             *************************************************************************************/
+
+            // REM.: For this type of web sites/applications, the Top 100 (SimilarWeb, 2019)
+            //       and the Top 50 (Alexa Internet, 2020) are covered. National variants
+            //       have been added when available. Mobile and desktop versions supported.
+            //
+            //       A few other popular web sites/applications have also been added.
+            //
+            //       Could not be added, however:
+            //       web sites/applications that don't use an "id" attribute for their login field.
+
+            // NOTE: The case of OAuth compatible web sites/applications that also provide
+            //       a "user ID only" login page in this situation
+            //       was taken into account in the tests as well.
+
+            /*
+             * A
+             */
+
+            // Amazon ——— ap_email_login = mobile / ap_email = desktop (amazon.co.jp currently uses ap_email in both cases, as of July 2020).
+            new KnownUsernameField("amazon.ae",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.ca",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.cn",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.co.jp",           new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.co.uk",           new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.com",             new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.com.au",          new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.com.br",          new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.com.mx",          new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.com.tr",          new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.de",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.es",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.fr",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.in",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.it",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.nl",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.sa",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+            new KnownUsernameField("amazon.sg",              new (string, string)[] { ("contains:/ap/signin", "ap_email_login,ap_email") }),
+
+            // Amazon Web Services
+            new KnownUsernameField("signin.aws.amazon.com",  new (string, string)[] { ("signin", "resolving_input") }),
+
+            // Atlassian
+            new KnownUsernameField("id.atlassian.com",       new (string, string)[] { ("login", "username") }),
+
+            /*
+             * B
+             */
+
+            // Bitly ——— enterprise users.
+            new KnownUsernameField("bitly.com",              new (string, string)[] { ("/sso/url_slug", "url_slug") }),
+
+            /*
+             * E
+             */
+
+            // eBay ——— 1st = traditional access / 2nd = direct access (i.e. https://signin.ebay.tld/).
+            new KnownUsernameField("signin.befr.ebay.be",    new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.benl.ebay.be",    new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.cafr.ebay.ca",    new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.at",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.be",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.ca",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.ch",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.co.uk",      new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.com",        new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.com.au",     new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.com.hk",     new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.com.my",     new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.com.sg",     new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.de",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.es",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.fr",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.ie",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.in",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.it",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.nl",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.ph",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+            new KnownUsernameField("signin.ebay.pl",         new (string, string)[] { ("iendswith:eBayISAPI.dll", "userid"), ("icontains:/signin/", "userid") }),
+
+            /*
+             * G
+             */
+
+            // Google ——— 1st = used in most cases (v2) / 2nd = used in some cases (v1).
+            new KnownUsernameField("accounts.google.com",    new (string, string)[] { ("identifier", "identifierId"), ("ServiceLogin", "Email") }),
+
+            /*
+             * P
+             */
+
+            // PayPal ——— 1st = traditional access / 2nd = access using OAuth.
+            new KnownUsernameField("paypal.com",             new (string, string)[] { ("signin", "email"), ("contains:/connect/", "email") }),
+
+            /*
+             * T
+             */
+
+            // Tumblr ——— despite "signup" in its ID, it's the login field (the website offers registration if the account doesn't exist).
+            new KnownUsernameField("tumblr.com",             new (string, string)[] { ("login", "signup_determine_email") }),
+
+            /*
+             * Y
+             */
+
+            // Yandex
+            new KnownUsernameField("passport.yandex.az",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.by",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.co.il",  new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.com",    new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.com.am", new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.com.ge", new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.com.tr", new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.ee",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.fi",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.fr",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.kg",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.kz",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.lt",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.lv",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.md",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.pl",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.ru",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.tj",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.tm",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.ua",     new (string, string)[] { ("auth", "passp-field-login") }),
+            new KnownUsernameField("passport.yandex.uz",     new (string, string)[] { ("auth", "passp-field-login") }),
+
+            /**************************************************************************************
+             * SECTION B ——— Top 100 worldwide
+             *************************************************************************************/
+
+            // As of July 2020, all entries that needed to be added from
+            // Top 100 (SimilarWeb, 2019) and Top 50 (Alexa Internet, 2020)
+            // matched section A.
+            //
+            // Therefore, no entry currently.
+
+            /**************************************************************************************
+             * SECTION C ——— Top 20 for selected countries
+             *************************************************************************************/
+
+            // REM.: For these selected countries, the Top 20 (SimilarWeb, 2020)
+            //       and the Top 20 (Alexa Internet, 2020) are covered.
+            //       Mobile and desktop versions supported.
+            //
+            //       Could not be added, however:
+            //       web sites/applications that don't use an "id" attribute for their login field.
+
+            /*
+             * Japan
+             */
+
+            // NTT DOCOMO ——— mainly used for "My docomo".
+            new KnownUsernameField("cfg.smt.docomo.ne.jp",   new (string, string)[] { ("contains:/auth/", "Di_Uid") }),
+            new KnownUsernameField("id.smt.docomo.ne.jp",    new (string, string)[] { ("contains:/cgi7/", "Di_Uid") }),
+
+            /**************************************************************************************
+             * SECTION D ——— Miscellaneous
+             *************************************************************************************/
+
+            /*
+             * Various entries ——— Following user requests, etc.
+             */
+
+            // No entry, currently.
+
+            /**************************************************************************************
+             * SECTION Z ——— Special forms
+             *
+             * Despite "user ID + password" fields both visible, detection rules required.
+             *************************************************************************************/
+
+            /*
+             * Main
+             */
+
+            // No entry, currently.
+
+            /*
+             * Test/example purposes only
+             */
+
+            // GitHub ——— VERY special case (signup form, just to test the proper functioning of special forms).
+            new KnownUsernameField("github.com",             new (string, string)[] { ("", "user[login]-footer") }),
        }.ToDictionary(n => n.UriAuthority);

        public static void PrintTestData(AccessibilityNodeInfo root, AccessibilityEvent e)
@@ -199,12 +391,12 @@ namespace Bit.Droid.Accessibility
                var hasHttpProtocol = uri.StartsWith("http://") || uri.StartsWith("https://");
                if (!hasHttpProtocol && uri.Contains("."))
                {
-                    if (Uri.TryCreate("http://" + uri, UriKind.Absolute, out var uri2))
+                    if (Uri.TryCreate("https://" + uri, UriKind.Absolute, out var _))
                    {
-                        return string.Concat("http://", uri);
+                        return string.Concat("https://", uri);
                    }
                }
-                if (Uri.TryCreate(uri, UriKind.Absolute, out var uri3))
+                if (Uri.TryCreate(uri, UriKind.Absolute, out var _))
                {
                    return uri;
                }
@@ -314,7 +506,7 @@ namespace Bit.Droid.Accessibility
            if (Uri.TryCreate(uriString, UriKind.Absolute, out var uri))
            {
                uriAuthority = uri.Authority;
-                uriKey = uriAuthority.StartsWith("www.") ? uriAuthority.Substring(4) : uriAuthority;
+                uriKey = uriAuthority.StartsWith("www.", StringComparison.Ordinal) ? uriAuthority.Substring(4) : uriAuthority;
                uriLocalPath = uri.LocalPath;
            }

@@ -330,15 +522,64 @@ namespace Bit.Droid.Accessibility
                if (KnownUsernameFields.ContainsKey(uriKey))
                {
                    var usernameField = KnownUsernameFields[uriKey];
-                    if (uriLocalPath.EndsWith(usernameField.UriPathEnd))
+                    (string UriPathWanted, string UsernameViewId)[] accessOptions = usernameField.AccessOptions;
+
+                    for (int i = 0; i < accessOptions.Length; i++)
                    {
-                        foreach (var editText in allEditTexts)
+                        string curUriPathWanted = accessOptions[i].UriPathWanted;
+                        string curUsernameViewId = accessOptions[i].UsernameViewId;
+                        bool uriLocalPathMatches = false;
+
+                        // Case-sensitive comparison
+                        if (curUriPathWanted.StartsWith("startswith:", StringComparison.Ordinal))
                        {
-                            foreach (var usernameViewId in usernameField.UsernameViewId.Split(","))
+                            curUriPathWanted = curUriPathWanted.Substring(11);
+                            uriLocalPathMatches = uriLocalPath.StartsWith(curUriPathWanted, StringComparison.Ordinal);
+                        }
+                        else if (curUriPathWanted.StartsWith("contains:", StringComparison.Ordinal))
+                        {
+                            curUriPathWanted = curUriPathWanted.Substring(9);
+                            uriLocalPathMatches = uriLocalPath.Contains(curUriPathWanted, StringComparison.Ordinal);
+                        }
+                        else if (curUriPathWanted.StartsWith("endswith:", StringComparison.Ordinal))
+                        {
+                            curUriPathWanted = curUriPathWanted.Substring(9);
+                            uriLocalPathMatches = uriLocalPath.EndsWith(curUriPathWanted, StringComparison.Ordinal);
+                        }
+
+                        // Case-insensitive comparison
+                        else if (curUriPathWanted.StartsWith("istartswith:", StringComparison.Ordinal))
+                        {
+                            curUriPathWanted = curUriPathWanted.Substring(12);
+                            uriLocalPathMatches = uriLocalPath.StartsWith(curUriPathWanted, StringComparison.OrdinalIgnoreCase);
+                        }
+                        else if (curUriPathWanted.StartsWith("icontains:", StringComparison.Ordinal))
+                        {
+                            curUriPathWanted = curUriPathWanted.Substring(10);
+                            uriLocalPathMatches = uriLocalPath.Contains(curUriPathWanted, StringComparison.OrdinalIgnoreCase);
+                        }
+                        else if (curUriPathWanted.StartsWith("iendswith:", StringComparison.Ordinal))
+                        {
+                            curUriPathWanted = curUriPathWanted.Substring(10);
+                            uriLocalPathMatches = uriLocalPath.EndsWith(curUriPathWanted, StringComparison.OrdinalIgnoreCase);
+                        }
+
+                        // Default type of comparison
+                        else
+                        {
+                            uriLocalPathMatches = uriLocalPath.EndsWith(curUriPathWanted, StringComparison.Ordinal);
+                        }
+
+                        if (uriLocalPathMatches)
+                        {
+                            foreach (var editText in allEditTexts)
                            {
-                                if (usernameViewId == editText.ViewIdResourceName)
+                                foreach (var usernameViewId in curUsernameViewId.Split(","))
                                {
-                                    return editText;
+                                    if (usernameViewId == editText.ViewIdResourceName)
+                                    {
+                                        return editText;
+                                    }
                                }
                            }
                        }
@@ -439,7 +680,7 @@ namespace Bit.Droid.Accessibility
            var icon = (ImageView)view.FindViewById(Resource.Id.icon);
            text1.Text = AppResources.AutofillWithBitwarden;
            text2.Text = AppResources.GoToMyVault;
-            icon.SetImageResource(Resource.Drawable.icon);
+            icon.SetImageResource(Resource.Drawable.shield);
            return view;
        }

--- a/src/Android/Accessibility/AccessibilityService.cs
+++ b/src/Android/Accessibility/AccessibilityService.cs
@@ -255,13 +255,13 @@ namespace Bit.Droid.Accessibility
            
            if (!AccessibilityHelpers.OverlayPermitted())
            {
-                if (!AccessibilityHelpers.IsAutofillTileAdded)
+                if (Build.VERSION.SdkInt <= BuildVersionCodes.M)
                {
                    // The user has the option of only using the autofill tile and leaving the overlay permission
-                    // disabled, so only show this toast if they're using accessibility without overlay permission and
-                    // have _not_ added the autofill tile
+                    // disabled, so only show this toast if they're using accessibility without overlay permission on
+                    // a version of Android without quick-action tile support
                    System.Diagnostics.Debug.WriteLine(">>> Overlay Permission not granted");
-                    Toast.MakeText(this, AppResources.AccessibilityOverlayPermissionAlert, ToastLength.Long).Show();   
+                    Toast.MakeText(this, AppResources.AccessibilityDrawOverPermissionAlert, ToastLength.Long).Show();   
                }
                return;
            }
--- a/src/Android/Accessibility/KnownUsernameField.cs
+++ b/src/Android/Accessibility/KnownUsernameField.cs
@@ -2,15 +2,13 @@
 {
    public class KnownUsernameField
    {
-        public KnownUsernameField(string uriAuthority, string uriPathEnd, string usernameViewId)
+        public KnownUsernameField(string uriAuthority, (string UriPathWanted, string UsernameViewId)[] accessOptions)
        {
            UriAuthority = uriAuthority;
-            UriPathEnd = uriPathEnd;
-            UsernameViewId = usernameViewId;
+            AccessOptions = accessOptions;
        }

        public string UriAuthority { get; set; }
-        public string UriPathEnd { get; set; }
-        public string UsernameViewId { get; set; }
+        public (string UriPathWanted, string UsernameViewId)[] AccessOptions { get; set; }
    }
 }
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -15,7 +15,7 @@
    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
@@ -77,8 +77,9 @@
    <PackageReference Include="Portable.BouncyCastle">
      <Version>1.8.6.7</Version>
    </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.3-beta01" />
    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.5.3.1</Version>
+      <Version>1.5.3.2</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Firebase.Messaging">
      <Version>71.1740.0</Version>
@@ -120,6 +121,9 @@
    <Compile Include="Receivers\LockAlarmReceiver.cs" />
    <Compile Include="Receivers\PackageReplacedReceiver.cs" />
    <Compile Include="Renderers\CipherViewCellRenderer.cs" />
+    <Compile Include="Renderers\ExtendedDatePickerRenderer.cs" />
+    <Compile Include="Renderers\CustomTabbedRenderer.cs" />
+    <Compile Include="Renderers\ExtendedTimePickerRenderer.cs" />
    <Compile Include="Renderers\ExtendedSliderRenderer.cs" />
    <Compile Include="Renderers\CustomEditorRenderer.cs" />
    <Compile Include="Renderers\CustomPickerRenderer.cs" />
@@ -127,12 +131,14 @@
    <Compile Include="Renderers\CustomSearchBarRenderer.cs" />
    <Compile Include="Renderers\ExtendedListViewRenderer.cs" />
    <Compile Include="Renderers\HybridWebViewRenderer.cs" />
+    <Compile Include="Renderers\SendViewCellRenderer.cs" />
    <Compile Include="Services\AndroidPushNotificationService.cs" />
    <Compile Include="Services\AndroidLogService.cs" />
    <Compile Include="MainApplication.cs" />
    <Compile Include="MainActivity.cs" />
    <Compile Include="Resources\Resource.designer.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\BiometricService.cs" />
    <Compile Include="Services\CryptoPrimitiveService.cs" />
    <Compile Include="Services\DeviceActionService.cs" />
    <Compile Include="Services\LocalizeService.cs" />
@@ -141,6 +147,7 @@
    <Compile Include="Tiles\MyVaultTileService.cs" />
    <Compile Include="Utilities\AndroidHelpers.cs" />
    <Compile Include="Utilities\AppCenterHelper.cs" />
+    <Compile Include="WebAuthCallbackActivity.cs" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\FontAwesome.ttf" />
@@ -155,32 +162,31 @@
    <None Include="upload-keystore.jks.enc" />
  </ItemGroup>
  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\accessibility_overlay.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\accessibility_permission.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\accessibility_step1.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\accessibility_step2.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\autofill_enable.png" />
-    <AndroidResource Include="Resources\drawable-hdpi\autofill_use.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_overlay.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_permission.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_step1.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\accessibility_step2.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\autofill_enable.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\autofill_use.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_overlay.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_permission.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_step1.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\accessibility_step2.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\autofill_enable.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\autofill_use.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_overlay.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_permission.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_step1.png" />
-    <AndroidResource Include="Resources\drawable\accessibility_step2.png" />
-    <AndroidResource Include="Resources\drawable\autofill_enable.png" />
-    <AndroidResource Include="Resources\drawable\autofill_use.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\logo_legacy.png" />
+    <AndroidResource Include="Resources\drawable-hdpi\logo_white_legacy.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\logo_legacy.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\logo_white_legacy.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\logo_legacy.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\logo_white_legacy.png" />
+    <AndroidResource Include="Resources\drawable\card.xml" />
+    <AndroidResource Include="Resources\drawable\cog.xml" />
    <AndroidResource Include="Resources\drawable\icon.xml" />
    <AndroidResource Include="Resources\drawable\ic_launcher_foreground.xml" />
+    <AndroidResource Include="Resources\drawable\id.xml" />
+    <AndroidResource Include="Resources\drawable\info.xml" />
+    <AndroidResource Include="Resources\drawable\lock.xml" />
+    <AndroidResource Include="Resources\drawable\login.xml" />
+    <AndroidResource Include="Resources\drawable\logo.xml" />
+    <AndroidResource Include="Resources\drawable\logo_white.xml" />
+    <AndroidResource Include="Resources\drawable\paper_plane.xml" />
+    <AndroidResource Include="Resources\drawable\pencil.xml" />
+    <AndroidResource Include="Resources\drawable\plus.xml" />
+    <AndroidResource Include="Resources\drawable\refresh.xml" />
+    <AndroidResource Include="Resources\drawable\search.xml" />
+    <AndroidResource Include="Resources\drawable\shield.xml" />
+    <AndroidResource Include="Resources\drawable-v23\splash_screen.xml" />
+    <AndroidResource Include="Resources\drawable-v23\splash_screen_dark.xml" />
+    <AndroidResource Include="Resources\layout\SendViewCell.axml" />
    <AndroidResource Include="Resources\layout\Tabbar.axml" />
    <AndroidResource Include="Resources\layout\Toolbar.axml" />
    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
@@ -195,6 +201,7 @@
    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_round.png" />
    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
+    <AndroidResource Include="Resources\values-night\styles.xml" />
    <AndroidResource Include="Resources\values\styles.xml" />
    <AndroidResource Include="Resources\values\colors.xml" />
  </ItemGroup>
@@ -203,7 +210,7 @@
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\App\App.csproj">
-      <Project>{9F1742A7-7D03-4BB3-8FCD-41BC3002B00A}</Project>
+      <Project>{EE44C6A1-2A85-45FE-8D9B-BF1D5F88809C}</Project>
      <Name>App</Name>
    </ProjectReference>
    <ProjectReference Include="..\Core\Core.csproj">
@@ -232,138 +239,15 @@
  <ItemGroup>
    <AndroidResource Include="Resources\layout\autofill_listitem.xml" />
  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\login.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\logo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values-v21\styles.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\logo.png" />
-  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable-hdpi\yubikey.png" />
  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\yubikey.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\shield.png" />
-  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable-xhdpi\yubikey.png" />
  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\logo.png" />
-  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable-xxhdpi\yubikey.png" />
  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\refresh.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\card.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\id.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\plus.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\pencil.png" />
-  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable\slider_thumb.xml" />
  </ItemGroup>
@@ -373,78 +257,12 @@
      <SubType>Designer</SubType>
    </AndroidResource>
  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\logo_white.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\logo_white.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\logo_white.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\search.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\cog.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\cog.png" />
-  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\dimens.xml">
      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
      <SubType>Designer</SubType>
    </AndroidResource>
  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\shield.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\refresh_sm.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxxhdpi\refresh_sm.png" />
-  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\layout\CipherViewCell.axml">
      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
--- a/src/Android/Autofill/AutofillHelpers.cs
+++ b/src/Android/Autofill/AutofillHelpers.cs
@@ -1,14 +1,24 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Android.Content;
 using Android.Service.Autofill;
 using Android.Widget;
 using System.Linq;
 using Android.App;
 using System.Threading.Tasks;
+using Android.App.Slices;
+using Android.Graphics;
+using Android.Graphics.Drawables;
+using Android.OS;
+using Android.Runtime;
+using Android.Widget.Inline;
 using Bit.App.Resources;
 using Bit.Core.Enums;
 using Android.Views.Autofill;
+using AndroidX.AutoFill.Inline;
+using AndroidX.AutoFill.Inline.V1;
 using Bit.Core.Abstractions;
+using SaveFlags = Android.Service.Autofill.SaveFlags;

 namespace Bit.Droid.Autofill
 {
@@ -38,9 +48,11 @@ namespace Bit.Droid.Autofill
        //   - ... to keep this list in sync with values in AccessibilityHelpers.SupportedBrowsers [Section A], too.
        public static HashSet<string> CompatBrowsers = new HashSet<string>
        {
+            "alook.browser",
            "com.amazon.cloud9",
            "com.android.browser",
            "com.android.chrome",
+            "com.android.htmlviewer",
            "com.avast.android.secure.browser",
            "com.avg.android.secure.browser",
            "com.brave.browser",
@@ -56,6 +68,8 @@ namespace Bit.Droid.Autofill
            "com.google.android.apps.chrome_dev",
            "com.kiwibrowser.browser",
            "com.microsoft.emmx",
+            "com.mmbox.browser",
+            "com.mmbox.xbrowser",
            "com.naver.whale",
            "com.opera.browser",
            "com.opera.browser.beta",
@@ -71,6 +85,12 @@ namespace Bit.Droid.Autofill
            "com.vivaldi.browser.snapshot",
            "com.vivaldi.browser.sopranos",
            "com.yandex.browser",
+            "com.z28j.feel",
+            "idm.internet.download.manager",
+            "idm.internet.download.manager.adm.lite",
+            "idm.internet.download.manager.plus",
+            "io.github.forkmaintainers.iceraven",
+            "mark.via",
            "mark.via.gp",
            "org.adblockplus.browser",
            "org.adblockplus.browser.beta",
@@ -89,7 +109,8 @@ namespace Bit.Droid.Autofill
            "org.mozilla.rocket",
            "org.torproject.torbrowser",
            "org.torproject.torbrowser_alpha",
-            "org.ungoogled.chromium",
+            "org.ungoogled.chromium.extensions.stable",
+            "org.ungoogled.chromium.stable",
        };

        // The URLs are blacklisted from autofilling
@@ -121,14 +142,49 @@ namespace Bit.Droid.Autofill
            return new List<FilledItem>();
        }

-        public static FillResponse BuildFillResponse(Parser parser, List<FilledItem> items, bool locked)
+        public static FillResponse BuildFillResponse(Parser parser, List<FilledItem> items, bool locked,
+            bool inlineAutofillEnabled, FillRequest fillRequest = null)
        {
+            // Acquire inline presentation specs on Android 11+
+            IList<InlinePresentationSpec> inlinePresentationSpecs = null;
+            var inlinePresentationSpecsCount = 0;
+            var inlineMaxSuggestedCount = 0;
+            if (inlineAutofillEnabled && fillRequest != null && (int)Build.VERSION.SdkInt >= 30)
+            {
+                var inlineSuggestionsRequest = fillRequest.InlineSuggestionsRequest;
+                inlineMaxSuggestedCount = inlineSuggestionsRequest?.MaxSuggestionCount ?? 0;
+                inlinePresentationSpecs = inlineSuggestionsRequest?.InlinePresentationSpecs;
+                inlinePresentationSpecsCount = inlinePresentationSpecs?.Count ?? 0;
+            }
+            
+            // Build response
            var responseBuilder = new FillResponse.Builder();
            if (items != null && items.Count > 0)
            {
-                foreach (var item in items)
+                var maxItems = items.Count;
+                if (inlineMaxSuggestedCount > 0)
                {
-                    var dataset = BuildDataset(parser.ApplicationContext, parser.FieldCollection, item);
+                    // -1 to adjust for 'open vault' option
+                    maxItems = Math.Min(maxItems, inlineMaxSuggestedCount - 1);
+                }
+                for (int i = 0; i < maxItems; i++)
+                {
+                    InlinePresentationSpec inlinePresentationSpec = null;
+                    if (inlinePresentationSpecs != null)
+                    {
+                        if (i < inlinePresentationSpecsCount)
+                        {
+                            inlinePresentationSpec = inlinePresentationSpecs[i];
+                        }
+                        else
+                        {
+                            // If the max suggestion count is larger than the number of specs in the list, then
+                            // the last spec is used for the remainder of the suggestions
+                            inlinePresentationSpec = inlinePresentationSpecs[inlinePresentationSpecsCount - 1];
+                        }
+                    }
+                    var dataset = BuildDataset(parser.ApplicationContext, parser.FieldCollection, items[i], 
+                        inlinePresentationSpec);
                    if (dataset != null)
                    {
                        responseBuilder.AddDataset(dataset);
@@ -136,16 +192,34 @@ namespace Bit.Droid.Autofill
                }
            }
            responseBuilder.AddDataset(BuildVaultDataset(parser.ApplicationContext, parser.FieldCollection,
-                parser.Uri, locked));
-            AddSaveInfo(parser, responseBuilder, parser.FieldCollection);
+                parser.Uri, locked, inlinePresentationSpecs));
+            AddSaveInfo(parser, fillRequest, responseBuilder, parser.FieldCollection);
            responseBuilder.SetIgnoredIds(parser.FieldCollection.IgnoreAutofillIds.ToArray());
            return responseBuilder.Build();
        }

-        public static Dataset BuildDataset(Context context, FieldCollection fields, FilledItem filledItem)
+        public static Dataset BuildDataset(Context context, FieldCollection fields, FilledItem filledItem,
+            InlinePresentationSpec inlinePresentationSpec = null)
        {
-            var datasetBuilder = new Dataset.Builder(
-                BuildListView(filledItem.Name, filledItem.Subtitle, filledItem.Icon, context));
+            var overlayPresentation = BuildOverlayPresentation(
+                filledItem.Name,
+                filledItem.Subtitle,
+                filledItem.Icon,
+                context);
+            
+            var inlinePresentation = BuildInlinePresentation(
+                inlinePresentationSpec, 
+                filledItem.Name, 
+                filledItem.Subtitle, 
+                filledItem.Icon, 
+                null, 
+                context);
+
+            var datasetBuilder = new Dataset.Builder(overlayPresentation);
+            if (inlinePresentation != null)
+            {
+                datasetBuilder.SetInlinePresentation(inlinePresentation);
+            }
            if (filledItem.ApplyToFields(fields, datasetBuilder))
            {
                return datasetBuilder.Build();
@@ -153,7 +227,8 @@ namespace Bit.Droid.Autofill
            return null;
        }

-        public static Dataset BuildVaultDataset(Context context, FieldCollection fields, string uri, bool locked)
+        public static Dataset BuildVaultDataset(Context context, FieldCollection fields, string uri, bool locked,
+            IList<InlinePresentationSpec> inlinePresentationSpecs = null)
        {
            var intent = new Intent(context, typeof(MainActivity));
            intent.PutExtra("autofillFramework", true);
@@ -177,14 +252,26 @@ namespace Bit.Droid.Autofill
            var pendingIntent = PendingIntent.GetActivity(context, ++_pendingIntentId, intent,
                PendingIntentFlags.CancelCurrent);

-            var view = BuildListView(
+            var overlayPresentation = BuildOverlayPresentation(
                AppResources.AutofillWithBitwarden,
                locked ? AppResources.VaultIsLocked : AppResources.GoToMyVault,
                Resource.Drawable.icon,
                context);

-            var datasetBuilder = new Dataset.Builder(view);
-            datasetBuilder.SetAuthentication(pendingIntent.IntentSender);
+            var inlinePresentation = BuildInlinePresentation(
+                inlinePresentationSpecs?.Last(), 
+                AppResources.Bitwarden, 
+                locked ? AppResources.VaultIsLocked : AppResources.MyVault, 
+                Resource.Drawable.icon, 
+                pendingIntent, 
+                context);
+
+            var datasetBuilder = new Dataset.Builder(overlayPresentation);
+            if (inlinePresentation != null)
+            {
+                datasetBuilder.SetInlinePresentation(inlinePresentation);
+            }
+            datasetBuilder.SetAuthentication(pendingIntent?.IntentSender);

            // Dataset must have a value set. We will reset this in the main activity when the real item is chosen.
            foreach (var autofillId in fields.AutofillIds)
@@ -194,7 +281,7 @@ namespace Bit.Droid.Autofill
            return datasetBuilder.Build();
        }

-        public static RemoteViews BuildListView(string text, string subtext, int iconId, Context context)
+        public static RemoteViews BuildOverlayPresentation(string text, string subtext, int iconId, Context context)
        {
            var packageName = context.PackageName;
            var view = new RemoteViews(packageName, Resource.Layout.autofill_listitem);
@@ -204,11 +291,87 @@ namespace Bit.Droid.Autofill
            return view;
        }

-        public static void AddSaveInfo(Parser parser, FillResponse.Builder responseBuilder, FieldCollection fields)
+        public static InlinePresentation BuildInlinePresentation(InlinePresentationSpec inlinePresentationSpec,
+            string text, string subtext, int iconId, PendingIntent pendingIntent, Context context)
+        {
+            if ((int)Build.VERSION.SdkInt < 30 || inlinePresentationSpec == null)
+            {
+                return null;
+            }
+            if (pendingIntent == null)
+            {
+                // InlinePresentation requires nonNull pending intent (even though we only utilize one for the
+                // "my vault" presentation) so we're including an empty one here
+                pendingIntent = PendingIntent.GetService(context, 0, new Intent(),
+                    PendingIntentFlags.OneShot | PendingIntentFlags.UpdateCurrent);
+            }
+            var slice = CreateInlinePresentationSlice(
+                inlinePresentationSpec,
+                text,
+                subtext,
+                iconId,
+                "Autofill option",
+                pendingIntent,
+                context);
+            if (slice != null)
+            {
+                return new InlinePresentation(slice, inlinePresentationSpec, false);
+            }
+            return null;
+        }
+
+        private static Slice CreateInlinePresentationSlice(
+            InlinePresentationSpec inlinePresentationSpec,
+            string text,
+            string subtext,
+            int iconId,
+            string contentDescription,
+            PendingIntent pendingIntent,
+            Context context)
+        {
+            var imeStyle = inlinePresentationSpec.Style;
+            if (!UiVersions.GetVersions(imeStyle).Contains(UiVersions.InlineUiVersion1))
+            {
+                return null;
+            }
+            var contentBuilder = InlineSuggestionUi.NewContentBuilder(pendingIntent)
+                .SetContentDescription(contentDescription);
+            if (!string.IsNullOrWhiteSpace(text))
+            {
+                contentBuilder.SetTitle(text);
+            }
+            if (!string.IsNullOrWhiteSpace(subtext))
+            {
+                contentBuilder.SetSubtitle(subtext);
+            }
+            if (iconId > 0)
+            {
+                var icon = Icon.CreateWithResource(context, iconId);
+                if (icon != null)
+                {
+                    if (iconId == Resource.Drawable.icon)
+                    {
+                        // Don't tint our logo
+                        icon.SetTintBlendMode(BlendMode.Dst);
+                    }
+                    contentBuilder.SetStartIcon(icon);
+                }
+            }
+            return contentBuilder.Build().JavaCast<InlineSuggestionUi.Content>()?.Slice;
+        }
+
+        public static void AddSaveInfo(Parser parser, FillRequest fillRequest, FillResponse.Builder responseBuilder, 
+            FieldCollection fields)
        {
            // Docs state that password fields cannot be reliably saved in Compat mode since they will show as
            // masked values.
-            var compatBrowser = CompatBrowsers.Contains(parser.PackageName);
+            bool? compatRequest = null;
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.Q && fillRequest != null)
+            {
+                // Attempt to automatically establish compat request mode on Android 10+
+                compatRequest = (fillRequest.Flags | FillRequest.FlagCompatibilityModeRequest) == fillRequest.Flags;
+            }
+            var compatBrowser = compatRequest ?? CompatBrowsers.Contains(parser.PackageName);
            if (compatBrowser && fields.SaveType == SaveDataType.Password)
            {
                return;
--- a/src/Android/Autofill/AutofillService.cs
+++ b/src/Android/Autofill/AutofillService.cs
@@ -23,6 +23,8 @@ namespace Bit.Droid.Autofill
        private ICipherService _cipherService;
        private IVaultTimeoutService _vaultTimeoutService;
        private IStorageService _storageService;
+        private IPolicyService _policyService;
+        private IUserService _userService;

        public async override void OnFillRequest(FillRequest request, CancellationSignal cancellationSignal,
            FillCallback callback)
@@ -46,6 +48,8 @@ namespace Bit.Droid.Autofill
            {
                return;
            }
+            
+            var inlineAutofillEnabled = await _storageService.GetAsync<bool?>(Constants.InlineAutofillEnabledKey) ?? true;

            if (_vaultTimeoutService == null)
            {
@@ -64,7 +68,7 @@ namespace Bit.Droid.Autofill
            }

            // build response
-            var response = AutofillHelpers.BuildFillResponse(parser, items, locked);
+            var response = AutofillHelpers.BuildFillResponse(parser, items, locked, inlineAutofillEnabled, request);
            callback.OnSuccess(response);
        }

@@ -87,6 +91,26 @@ namespace Bit.Droid.Autofill
                return;
            }

+            _policyService ??= ServiceContainer.Resolve<IPolicyService>("policyService");
+
+            var personalOwnershipPolicies = await _policyService.GetAll(PolicyType.PersonalOwnership);
+            if (personalOwnershipPolicies != null)
+            {
+                _userService ??= ServiceContainer.Resolve<IUserService>("userService");
+                foreach (var policy in personalOwnershipPolicies)
+                {
+                    if (policy.Enabled)
+                    {
+                        var org = await _userService.GetOrganizationAsync(policy.OrganizationId);
+                        if (org != null && org.Enabled && org.UsePolicies && !org.canManagePolicies
+                           && org.Status == OrganizationUserStatusType.Confirmed)
+                        {
+                            return;
+                        }
+                    }
+                }
+            }
+            
            var parser = new Parser(structure, ApplicationContext);
            parser.Parse();

--- a/src/Android/Autofill/FilledItem.cs
+++ b/src/Android/Autofill/FilledItem.cs
@@ -221,4 +221,4 @@ namespace Bit.Droid.Autofill
            return null;
        }
    }
-}
+}
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -18,15 +18,18 @@ using Android.Nfc;
 using Bit.App.Utilities;
 using System.Threading.Tasks;
 using AndroidX.Core.Content;
+using ZXing.Net.Mobile.Android;

 namespace Bit.Droid
 {
    [Activity(
        Label = "Bitwarden",
        Icon = "@mipmap/ic_launcher",
-        Theme = "@style/LightTheme.Splash",
+        Theme = "@style/LaunchTheme",
        MainLauncher = true,
-        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+        ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation |
+                               ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden |
+                               ConfigChanges.Navigation)]
    [Register("com.x8bit.bitwarden.MainActivity")]
    public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
    {
@@ -143,6 +146,7 @@ namespace Bit.Droid
        protected override void OnResume()
        {
            base.OnResume();
+            Xamarin.Essentials.Platform.OnResume();
            if (_deviceActionService.SupportsNfc())
            {
                try
@@ -193,8 +197,7 @@ namespace Bit.Droid
            else
            {
                Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-                ZXing.Net.Mobile.Forms.Android.PermissionsHandler.OnRequestPermissionsResult(
-                    requestCode, permissions, grantResults);
+                PermissionsHandler.OnRequestPermissionsResult(requestCode, permissions, grantResults);
            }
            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
        }
@@ -333,7 +336,11 @@ namespace Bit.Droid

        private void UpdateTheme(string theme)
        {
-            if (theme == "dark")
+            if (theme == "light")
+            {
+                SetTheme(Resource.Style.LightTheme);
+            }
+            else if (theme == "dark")
            {
                SetTheme(Resource.Style.DarkTheme);
            }
@@ -347,7 +354,14 @@ namespace Bit.Droid
            }
            else
            {
-                SetTheme(Resource.Style.LightTheme);
+                if (_deviceActionService.UsingDarkTheme())
+                {
+                    SetTheme(Resource.Style.DarkTheme);
+                }
+                else
+                {
+                    SetTheme(Resource.Style.LightTheme);
+                }
            }
        }

--- a/src/Android/MainApplication.cs
+++ b/src/Android/MainApplication.cs
@@ -41,7 +41,8 @@ namespace Bit.Droid
            {
                RegisterLocalServices();
                var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-                ServiceContainer.Init(deviceActionService.DeviceUserAgent);
+                ServiceContainer.Init(deviceActionService.DeviceUserAgent, Constants.ClearCiphersCacheKey,
+                    Constants.AndroidAllClearCipherCacheKeys);
            }
 #if !FDROID
            if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -86,7 +87,6 @@ namespace Bit.Droid
            var preferencesStorage = new PreferencesStorageService(null);
            var documentsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
            var liteDbStorage = new LiteDbStorageService(Path.Combine(documentsPath, "bitwarden.db"));
-            liteDbStorage.InitAsync();
            var localizeService = new LocalizeService();
            var broadcasterService = new BroadcasterService();
            var messagingService = new MobileBroadcasterMessagingService(broadcasterService);
@@ -98,6 +98,7 @@ namespace Bit.Droid
                broadcasterService, () => ServiceContainer.Resolve<IEventService>("eventService"));
            var platformUtilsService = new MobilePlatformUtilsService(deviceActionService, messagingService,
                broadcasterService);
+            var biometricService = new BiometricService();

            ServiceContainer.Register<IBroadcasterService>("broadcasterService", broadcasterService);
            ServiceContainer.Register<IMessagingService>("messagingService", messagingService);
@@ -108,6 +109,7 @@ namespace Bit.Droid
            ServiceContainer.Register<IStorageService>("secureStorageService", secureStorageService);
            ServiceContainer.Register<IDeviceActionService>("deviceActionService", deviceActionService);
            ServiceContainer.Register<IPlatformUtilsService>("platformUtilsService", platformUtilsService);
+            ServiceContainer.Register<IBiometricService>("biometricService", biometricService);

            // Push
 #if FDROID
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -3,10 +3,11 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
  android:versionCode="1"
-  android:versionName="2.5.5"
+  android:versionName="2.9.0"
+  android:installLocation="internalOnly"
  package="com.x8bit.bitwarden">

-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />

  <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.NFC" />
@@ -23,7 +24,7 @@

  <application
    android:label="Bitwarden"
-    android:theme="@style/LightTheme.Splash"
+    android:theme="@style/LaunchTheme"
    android:allowBackup="false"
    tools:replace="android:allowBackup"
    android:icon="@mipmap/ic_launcher"
@@ -63,4 +64,17 @@
    <!-- Support for LG "Dual Window" mode (for Android < 7.0 users) -->
    <meta-data android:name="com.lge.support.SPLIT_WINDOW" android:value="true" />
  </application>
+
+  <!-- Package visibility (for Android 11+) -->
+  <queries>
+      <intent>
+          <action android:name="android.intent.action.VIEW"/>
+          <data android:scheme="http"/>
+      </intent>
+      <intent>
+          <action android:name="android.intent.action.VIEW"/>
+          <data android:scheme="https"/>
+      </intent>
+  </queries>
+
 </manifest>
--- a/src/Android/Receivers/ClearClipboardAlarmReceiver.cs
+++ b/src/Android/Receivers/ClearClipboardAlarmReceiver.cs
@@ -8,7 +8,7 @@ namespace Bit.Droid.Receivers
        public override void OnReceive(Context context, Intent intent)
        {
            var clipboardManager = context.GetSystemService(Context.ClipboardService) as ClipboardManager;
-            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", string.Empty);
+            clipboardManager.PrimaryClip = ClipData.NewPlainText("bitwarden", " ");
        }
    }
 }
--- a/src/Android/Renderers/CipherViewCellRenderer.cs
+++ b/src/Android/Renderers/CipherViewCellRenderer.cs
@@ -27,12 +27,15 @@ namespace Bit.Droid.Renderers
        private static Android.Graphics.Color _textColor;
        private static Android.Graphics.Color _mutedColor;
        private static Android.Graphics.Color _disabledIconColor;
+        private static bool _usingLightTheme;

        private AndroidCipherCell _cell;

        protected override Android.Views.View GetCellCore(Cell item, Android.Views.View convertView,
            ViewGroup parent, Context context)
        {
+            // TODO expand beyond light/dark detection once we support custom theme switching without app restart
+            var themeChanged = _usingLightTheme != ThemeManager.UsingLightTheme;
            if (_faTypeface == null)
            {
                _faTypeface = Typeface.CreateFromAsset(context.Assets, "FontAwesome.ttf");
@@ -41,18 +44,19 @@ namespace Bit.Droid.Renderers
            {
                _miTypeface = Typeface.CreateFromAsset(context.Assets, "MaterialIcons_Regular.ttf");
            }
-            if (_textColor == default(Android.Graphics.Color))
+            if (_textColor == default(Android.Graphics.Color) || themeChanged)
            {
                _textColor = ThemeManager.GetResourceColor("TextColor").ToAndroid();
            }
-            if (_mutedColor == default(Android.Graphics.Color))
+            if (_mutedColor == default(Android.Graphics.Color) || themeChanged)
            {
                _mutedColor = ThemeManager.GetResourceColor("MutedColor").ToAndroid();
            }
-            if (_disabledIconColor == default(Android.Graphics.Color))
+            if (_disabledIconColor == default(Android.Graphics.Color) || themeChanged)
            {
                _disabledIconColor = ThemeManager.GetResourceColor("DisabledIconColor").ToAndroid();
            }
+            _usingLightTheme = ThemeManager.UsingLightTheme;

            var cipherCell = item as CipherViewCell;
            _cell = convertView as AndroidCipherCell;
--- a/src/Android/Renderers/CustomEntryRenderer.cs
+++ b/src/Android/Renderers/CustomEntryRenderer.cs
@@ -40,19 +40,23 @@ namespace Bit.Droid.Renderers
            {
                // Check if field type is text, otherwise ignore (numeric passwords, etc.)
                EditText.InputType = Element.Keyboard.ToInputType();
-                if ((EditText.InputType & InputTypes.ClassText) == InputTypes.ClassText)
+                bool isText = (EditText.InputType & InputTypes.ClassText) == InputTypes.ClassText,
+                    isNumber = (EditText.InputType & InputTypes.ClassNumber) == InputTypes.ClassNumber;
+                if (isText || isNumber)
                {
                    if (Element.IsPassword)
                    {
                        // Element is a password field, set inputType to TextVariationPassword which disables
                        // predictive text by default
-                        EditText.InputType = EditText.InputType | InputTypes.TextVariationPassword;
+                        EditText.InputType = EditText.InputType |
+                            (isText ? InputTypes.TextVariationPassword : InputTypes.NumberVariationPassword);
                    }
                    else
                    {
                        // Element is not a password field, set inputType to TextVariationVisiblePassword to
                        // disable predictive text while still displaying the content.
-                        EditText.InputType = EditText.InputType | InputTypes.TextVariationVisiblePassword;
+                        EditText.InputType = EditText.InputType |
+                            (isText ? InputTypes.TextVariationVisiblePassword : InputTypes.NumberVariationNormal);
                    }
                    
                    // The workaround above forces a reset of the style properties, so we need to re-apply the font.
--- a/src/Android/Renderers/CustomTabbedRenderer.cs
+++ b/src/Android/Renderers/CustomTabbedRenderer.cs
@@ -0,0 +1,60 @@
+using Android.Content;
+using Android.Views;
+using Bit.Droid.Renderers;
+using Google.Android.Material.BottomNavigation;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+using Xamarin.Forms.Platform.Android.AppCompat;
+
+[assembly: ExportRenderer(typeof(TabbedPage), typeof(CustomTabbedRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class CustomTabbedRenderer : TabbedPageRenderer, BottomNavigationView.IOnNavigationItemReselectedListener
+    {
+        private TabbedPage _page;
+
+        public CustomTabbedRenderer(Context context) : base(context) { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<TabbedPage> e)
+        {
+            base.OnElementChanged(e);
+            if (e.NewElement != null)
+            {
+                _page = e.NewElement;
+                GetBottomNavigationView()?.SetOnNavigationItemReselectedListener(this);
+            }
+            else
+            {
+                _page = e.OldElement;
+            }
+        }
+
+        private BottomNavigationView GetBottomNavigationView()
+        {
+            for (var i = 0; i < ViewGroup.ChildCount; i++)
+            {
+                var childView = ViewGroup.GetChildAt(i);
+                if (childView is ViewGroup viewGroup)
+                {
+                    for (var j = 0; j < viewGroup.ChildCount; j++)
+                    {
+                        var childRelativeLayoutView = viewGroup.GetChildAt(j);
+                        if (childRelativeLayoutView is BottomNavigationView bottomNavigationView)
+                        {
+                            return bottomNavigationView;
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        async void BottomNavigationView.IOnNavigationItemReselectedListener.OnNavigationItemReselected(IMenuItem item)
+        {
+            if (_page?.CurrentPage?.Navigation != null && _page.CurrentPage.Navigation.NavigationStack.Count > 0)
+            {
+                await _page.CurrentPage.Navigation.PopToRootAsync();
+            }
+        }
+    }
+}
--- a/src/Android/Renderers/ExtendedDatePickerRenderer.cs
+++ b/src/Android/Renderers/ExtendedDatePickerRenderer.cs
@@ -0,0 +1,50 @@
+using System.ComponentModel;
+using Android.Content;
+using Android.Views;
+using Bit.App.Controls;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ExtendedDatePicker), typeof(ExtendedDatePickerRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class ExtendedDatePickerRenderer : DatePickerRenderer
+    {
+        public ExtendedDatePickerRenderer(Context context)
+            : base(context) { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<DatePicker> e)
+        {
+            base.OnElementChanged(e);
+            if (Control != null && Element is ExtendedDatePicker element)
+            {
+                // center text
+                Control.Gravity = GravityFlags.CenterHorizontal;
+
+                // use placeholder until NullableDate set 
+                if (!element.NullableDate.HasValue)
+                {
+                    Control.Text = element.PlaceHolder;
+                }
+            }
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == DatePicker.DateProperty.PropertyName ||
+                e.PropertyName == DatePicker.FormatProperty.PropertyName)
+            {
+                if (Control != null && Element is ExtendedDatePicker element)
+                {
+                    if (Element.Format == element.PlaceHolder)
+                    {
+                        Control.Text = element.PlaceHolder;
+                        return;
+                    }
+                }
+            }
+            base.OnElementPropertyChanged(sender, e);
+        }
+    }
+}
--- a/src/Android/Renderers/ExtendedTimePickerRenderer.cs
+++ b/src/Android/Renderers/ExtendedTimePickerRenderer.cs
@@ -0,0 +1,50 @@
+using System.ComponentModel;
+using Android.Content;
+using Android.Views;
+using Bit.App.Controls;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ExtendedTimePicker), typeof(ExtendedTimePickerRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class ExtendedTimePickerRenderer : TimePickerRenderer
+    {
+        public ExtendedTimePickerRenderer(Context context)
+            : base(context) { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<TimePicker> e)
+        {
+            base.OnElementChanged(e);
+            if (Control != null && Element is ExtendedTimePicker element)
+            {
+                // center text
+                Control.Gravity = GravityFlags.CenterHorizontal;
+
+                // use placeholder until NullableTime set 
+                if (!element.NullableTime.HasValue)
+                {
+                    Control.Text = element.PlaceHolder;
+                }
+            }
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == TimePicker.TimeProperty.PropertyName ||
+                e.PropertyName == TimePicker.FormatProperty.PropertyName)
+            {
+                if (Control != null && Element is ExtendedTimePicker element)
+                {
+                    if (Element.Format == element.PlaceHolder)
+                    {
+                        Control.Text = element.PlaceHolder;
+                        return;
+                    }
+                }
+            }
+            base.OnElementPropertyChanged(sender, e);
+        }
+    }
+}
--- a/src/Android/Renderers/SendViewCellRenderer.cs
+++ b/src/Android/Renderers/SendViewCellRenderer.cs
@@ -0,0 +1,210 @@
+using System;
+using System.ComponentModel;
+using Android.App;
+using Android.Content;
+using Android.Graphics;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using Bit.App.Controls;
+using Bit.App.Utilities;
+using Bit.Droid.Renderers;
+using FFImageLoading.Work;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+using Button = Android.Widget.Button;
+using Color = Android.Graphics.Color;
+using View = Android.Views.View;
+
+[assembly: ExportRenderer(typeof(SendViewCell), typeof(SendViewCellRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class SendViewCellRenderer : ViewCellRenderer
+    {
+        private static Typeface _faTypeface;
+        private static Typeface _miTypeface;
+        private static Color _textColor;
+        private static Color _mutedColor;
+        private static Color _disabledIconColor;
+        private static bool _usingLightTheme;
+
+        private AndroidSendCell _cell;
+
+        protected override View GetCellCore(Cell item, View convertView,
+            ViewGroup parent, Context context)
+        {
+            // TODO expand beyond light/dark detection once we support custom theme switching without app restart
+            var themeChanged = _usingLightTheme != ThemeManager.UsingLightTheme;
+            if (_faTypeface == null)
+            {
+                _faTypeface = Typeface.CreateFromAsset(context.Assets, "FontAwesome.ttf");
+            }
+            if (_miTypeface == null)
+            {
+                _miTypeface = Typeface.CreateFromAsset(context.Assets, "MaterialIcons_Regular.ttf");
+            }
+            if (_textColor == default(Color) || themeChanged)
+            {
+                _textColor = ThemeManager.GetResourceColor("TextColor").ToAndroid();
+            }
+            if (_mutedColor == default(Color) || themeChanged)
+            {
+                _mutedColor = ThemeManager.GetResourceColor("MutedColor").ToAndroid();
+            }
+            if (_disabledIconColor == default(Color) || themeChanged)
+            {
+                _disabledIconColor = ThemeManager.GetResourceColor("DisabledIconColor").ToAndroid();
+            }
+            _usingLightTheme = ThemeManager.UsingLightTheme;
+
+            var sendCell = item as SendViewCell;
+            _cell = convertView as AndroidSendCell;
+            if (_cell == null)
+            {
+                _cell = new AndroidSendCell(context, sendCell, _faTypeface, _miTypeface);
+            }
+            else
+            {
+                _cell.SendViewCell.PropertyChanged -= CellPropertyChanged;
+            }
+            sendCell.PropertyChanged += CellPropertyChanged;
+            _cell.UpdateCell(sendCell);
+            _cell.UpdateColors(_textColor, _mutedColor, _disabledIconColor);
+            return _cell;
+        }
+
+        public void CellPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            var sendCell = sender as SendViewCell;
+            _cell.SendViewCell = sendCell;
+            if (e.PropertyName == SendViewCell.SendProperty.PropertyName)
+            {
+                _cell.UpdateCell(sendCell);
+            }
+        }
+    }
+
+    public class AndroidSendCell : LinearLayout, INativeElementView
+    {
+        private readonly Typeface _faTypeface;
+        private readonly Typeface _miTypeface;
+
+        private IScheduledWork _currentTask;
+
+        public AndroidSendCell(Context context, SendViewCell sendView, Typeface faTypeface, Typeface miTypeface)
+            : base(context)
+        {
+            SendViewCell = sendView;
+            _faTypeface = faTypeface;
+            _miTypeface = miTypeface;
+
+            var view = (context as Activity).LayoutInflater.Inflate(Resource.Layout.SendViewCell, null);
+            Icon = view.FindViewById<TextView>(Resource.Id.SendCellIcon);
+            Name = view.FindViewById<TextView>(Resource.Id.SendCellName);
+            SubTitle = view.FindViewById<TextView>(Resource.Id.SendCellSubTitle);
+            DisabledIcon = view.FindViewById<TextView>(Resource.Id.SendCellDisabledIcon);
+            HasPasswordIcon = view.FindViewById<TextView>(Resource.Id.SendCellHasPasswordIcon);
+            MaxAccessCountReachedIcon = view.FindViewById<TextView>(Resource.Id.SendCellMaxAccessCountReachedIcon);
+            ExpiredIcon = view.FindViewById<TextView>(Resource.Id.SendCellExpiredIcon);
+            PendingDeleteIcon = view.FindViewById<TextView>(Resource.Id.SendCellPendingDeleteIcon);
+            MoreButton = view.FindViewById<Button>(Resource.Id.SendCellButton);
+            MoreButton.Click += MoreButton_Click;
+
+            Icon.Typeface = _faTypeface;
+            DisabledIcon.Typeface = _faTypeface;
+            HasPasswordIcon.Typeface = _faTypeface;
+            MaxAccessCountReachedIcon.Typeface = _faTypeface;
+            ExpiredIcon.Typeface = _faTypeface;
+            PendingDeleteIcon.Typeface = _faTypeface;
+            MoreButton.Typeface = _miTypeface;
+
+            var small = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
+            Icon.SetTextSize(ComplexUnitType.Pt, 10);
+            Name.SetTextSize(ComplexUnitType.Sp, (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label)));
+            SubTitle.SetTextSize(ComplexUnitType.Sp, small);
+            DisabledIcon.SetTextSize(ComplexUnitType.Sp, small);
+            HasPasswordIcon.SetTextSize(ComplexUnitType.Sp, small);
+            MaxAccessCountReachedIcon.SetTextSize(ComplexUnitType.Sp, small);
+            ExpiredIcon.SetTextSize(ComplexUnitType.Sp, small);
+            PendingDeleteIcon.SetTextSize(ComplexUnitType.Sp, small);
+            MoreButton.SetTextSize(ComplexUnitType.Sp, 25);
+
+            if (!SendViewCell.ShowOptions)
+            {
+                MoreButton.Visibility = ViewStates.Gone;
+            }
+
+            AddView(view);
+        }
+
+        public SendViewCell SendViewCell { get; set; }
+        public Element Element => SendViewCell;
+
+        public TextView Icon { get; set; }
+        public TextView Name { get; set; }
+        public TextView SubTitle { get; set; }
+        public TextView DisabledIcon { get; set; }
+        public TextView HasPasswordIcon { get; set; }
+        public TextView MaxAccessCountReachedIcon { get; set; }
+        public TextView ExpiredIcon { get; set; }
+        public TextView PendingDeleteIcon { get; set; }
+        public Button MoreButton { get; set; }
+
+        public void UpdateCell(SendViewCell sendCell)
+        {
+            UpdateIconImage(sendCell);
+
+            var send = sendCell.Send;
+            Name.Text = send.Name;
+            SubTitle.Text = send.DisplayDate;
+            DisabledIcon.Visibility = send.Disabled ? ViewStates.Visible : ViewStates.Gone;
+            HasPasswordIcon.Visibility = send.HasPassword ? ViewStates.Visible : ViewStates.Gone;
+            MaxAccessCountReachedIcon.Visibility = send.MaxAccessCountReached ? ViewStates.Visible : ViewStates.Gone;
+            ExpiredIcon.Visibility = send.Expired ? ViewStates.Visible : ViewStates.Gone;
+            PendingDeleteIcon.Visibility = send.PendingDelete ? ViewStates.Visible : ViewStates.Gone;
+        }
+
+        public void UpdateIconImage(SendViewCell sendCell)
+        {
+            if (_currentTask != null && !_currentTask.IsCancelled && !_currentTask.IsCompleted)
+            {
+                _currentTask.Cancel();
+            }
+
+            var send = sendCell.Send;
+            var iconImage = sendCell.GetIconImage(send);
+            Icon.Text = iconImage;
+        }
+
+        public void UpdateColors(Color textColor, Color mutedColor,
+            Color iconDisabledColor)
+        {
+            Name.SetTextColor(textColor);
+            SubTitle.SetTextColor(mutedColor);
+            Icon.SetTextColor(mutedColor);
+            DisabledIcon.SetTextColor(mutedColor);
+            HasPasswordIcon.SetTextColor(mutedColor);
+            MaxAccessCountReachedIcon.SetTextColor(mutedColor);
+            ExpiredIcon.SetTextColor(mutedColor);
+            PendingDeleteIcon.SetTextColor(mutedColor);
+            MoreButton.SetTextColor(iconDisabledColor);
+        }
+
+        private void MoreButton_Click(object sender, EventArgs e)
+        {
+            if (SendViewCell.ButtonCommand?.CanExecute(SendViewCell.Send) ?? false)
+            {
+                SendViewCell.ButtonCommand.Execute(SendViewCell.Send);
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                MoreButton.Click -= MoreButton_Click;
+            }
+            base.Dispose(disposing);
+        }
+    }
+}
--- a/src/Android/Resources/drawable-hdpi/accessibility_overlay.png
+++ b/src/Android/Resources/drawable-hdpi/accessibility_overlay.png
--- a/src/Android/Resources/drawable-hdpi/accessibility_permission.png
+++ b/src/Android/Resources/drawable-hdpi/accessibility_permission.png
--- a/src/Android/Resources/drawable-hdpi/accessibility_step1.png
+++ b/src/Android/Resources/drawable-hdpi/accessibility_step1.png
--- a/src/Android/Resources/drawable-hdpi/accessibility_step2.png
+++ b/src/Android/Resources/drawable-hdpi/accessibility_step2.png
--- a/src/Android/Resources/drawable-hdpi/autofill_enable.png
+++ b/src/Android/Resources/drawable-hdpi/autofill_enable.png
--- a/src/Android/Resources/drawable-hdpi/autofill_use.png
+++ b/src/Android/Resources/drawable-hdpi/autofill_use.png
--- a/src/Android/Resources/drawable-hdpi/card.png
+++ b/src/Android/Resources/drawable-hdpi/card.png
--- a/src/Android/Resources/drawable-hdpi/cog.png
+++ b/src/Android/Resources/drawable-hdpi/cog.png
--- a/src/Android/Resources/drawable-hdpi/id.png
+++ b/src/Android/Resources/drawable-hdpi/id.png
--- a/src/Android/Resources/drawable-hdpi/lock.png
+++ b/src/Android/Resources/drawable-hdpi/lock.png
--- a/src/Android/Resources/drawable-hdpi/login.png
+++ b/src/Android/Resources/drawable-hdpi/login.png
--- a/src/Android/Resources/drawable-hdpi/logo_legacy.png
+++ b/src/Android/Resources/drawable-hdpi/logo_legacy.png
--- a/src/Android/Resources/drawable-hdpi/logo_white_legacy.png
+++ b/src/Android/Resources/drawable-hdpi/logo_white_legacy.png
--- a/src/Android/Resources/drawable-hdpi/pencil.png
+++ b/src/Android/Resources/drawable-hdpi/pencil.png
--- a/src/Android/Resources/drawable-hdpi/plus.png
+++ b/src/Android/Resources/drawable-hdpi/plus.png
--- a/src/Android/Resources/drawable-hdpi/refresh.png
+++ b/src/Android/Resources/drawable-hdpi/refresh.png
--- a/src/Android/Resources/drawable-hdpi/refresh_sm.png
+++ b/src/Android/Resources/drawable-hdpi/refresh_sm.png
--- a/src/Android/Resources/drawable-hdpi/search.png
+++ b/src/Android/Resources/drawable-hdpi/search.png
--- a/src/Android/Resources/drawable-hdpi/shield.png
+++ b/src/Android/Resources/drawable-hdpi/shield.png
--- a/src/Android/Resources/drawable-v23/splash_screen.xml
+++ b/src/Android/Resources/drawable-v23/splash_screen.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+TODO: When API 23 becomes our new minimum, replace 'splash_screen.xml' in 'drawable' with this version, and delete
+ all versions of 'logo_legacy.png' and 'logo_white_legacy.png'. The bitmaps only exist due to a bug in API <23 where
+ vector drawables used in layer-lists (our splash screen) stretch to fill the full height of the parent.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/lightgray"/>
+    </item>
+    <item
+        android:drawable="@drawable/logo"
+        android:tileMode="disabled"
+        android:gravity="center"/>
+</layer-list>
--- a/src/Android/Resources/drawable-v23/splash_screen_dark.xml
+++ b/src/Android/Resources/drawable-v23/splash_screen_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+TODO: When API 23 becomes our new minimum, replace 'splash_screen_dark.xml' in 'drawable' with this version, and delete
+ all versions of 'logo_legacy.png' and 'logo_white_legacy.png'. The bitmaps only exist due to a bug in API <23 where
+ vector drawables used in layer-lists (our splash screen) stretch to fill the full height of the parent.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/darkgray"/>
+    </item>
+    <item
+        android:drawable="@drawable/logo_white"
+        android:tileMode="disabled"
+        android:gravity="center"/>
+</layer-list>
--- a/src/Android/Resources/drawable-xhdpi/accessibility_overlay.png
+++ b/src/Android/Resources/drawable-xhdpi/accessibility_overlay.png
--- a/src/Android/Resources/drawable-xhdpi/accessibility_permission.png
+++ b/src/Android/Resources/drawable-xhdpi/accessibility_permission.png
--- a/src/Android/Resources/drawable-xhdpi/accessibility_step1.png
+++ b/src/Android/Resources/drawable-xhdpi/accessibility_step1.png
--- a/src/Android/Resources/drawable-xhdpi/accessibility_step2.png
+++ b/src/Android/Resources/drawable-xhdpi/accessibility_step2.png
--- a/src/Android/Resources/drawable-xhdpi/autofill_enable.png
+++ b/src/Android/Resources/drawable-xhdpi/autofill_enable.png
--- a/src/Android/Resources/drawable-xhdpi/autofill_use.png
+++ b/src/Android/Resources/drawable-xhdpi/autofill_use.png
--- a/src/Android/Resources/drawable-xhdpi/card.png
+++ b/src/Android/Resources/drawable-xhdpi/card.png
--- a/src/Android/Resources/drawable-xhdpi/cog.png
+++ b/src/Android/Resources/drawable-xhdpi/cog.png
--- a/src/Android/Resources/drawable-xhdpi/id.png
+++ b/src/Android/Resources/drawable-xhdpi/id.png
--- a/src/Android/Resources/drawable-xhdpi/lock.png
+++ b/src/Android/Resources/drawable-xhdpi/lock.png
--- a/src/Android/Resources/drawable-xhdpi/login.png
+++ b/src/Android/Resources/drawable-xhdpi/login.png
--- a/src/Android/Resources/drawable-xhdpi/logo_legacy.png
+++ b/src/Android/Resources/drawable-xhdpi/logo_legacy.png
--- a/src/Android/Resources/drawable-xhdpi/logo_white_legacy.png
+++ b/src/Android/Resources/drawable-xhdpi/logo_white_legacy.png
--- a/src/Android/Resources/drawable-xhdpi/pencil.png
+++ b/src/Android/Resources/drawable-xhdpi/pencil.png
--- a/src/Android/Resources/drawable-xhdpi/plus.png
+++ b/src/Android/Resources/drawable-xhdpi/plus.png
--- a/src/Android/Resources/drawable-xhdpi/refresh.png
+++ b/src/Android/Resources/drawable-xhdpi/refresh.png
--- a/src/Android/Resources/drawable-xhdpi/refresh_sm.png
+++ b/src/Android/Resources/drawable-xhdpi/refresh_sm.png
--- a/src/Android/Resources/drawable-xhdpi/search.png
+++ b/src/Android/Resources/drawable-xhdpi/search.png
--- a/src/Android/Resources/drawable-xhdpi/shield.png
+++ b/src/Android/Resources/drawable-xhdpi/shield.png
--- a/src/Android/Resources/drawable-xxhdpi/accessibility_overlay.png
+++ b/src/Android/Resources/drawable-xxhdpi/accessibility_overlay.png
--- a/src/Android/Resources/drawable-xxhdpi/accessibility_permission.png
+++ b/src/Android/Resources/drawable-xxhdpi/accessibility_permission.png
--- a/src/Android/Resources/drawable-xxhdpi/accessibility_step1.png
+++ b/src/Android/Resources/drawable-xxhdpi/accessibility_step1.png
--- a/src/Android/Resources/drawable-xxhdpi/accessibility_step2.png
+++ b/src/Android/Resources/drawable-xxhdpi/accessibility_step2.png
--- a/src/Android/Resources/drawable-xxhdpi/autofill_enable.png
+++ b/src/Android/Resources/drawable-xxhdpi/autofill_enable.png
--- a/src/Android/Resources/drawable-xxhdpi/autofill_use.png
+++ b/src/Android/Resources/drawable-xxhdpi/autofill_use.png
--- a/src/Android/Resources/drawable-xxhdpi/card.png
+++ b/src/Android/Resources/drawable-xxhdpi/card.png
--- a/src/Android/Resources/drawable-xxhdpi/cog.png
+++ b/src/Android/Resources/drawable-xxhdpi/cog.png
--- a/src/Android/Resources/drawable-xxhdpi/id.png
+++ b/src/Android/Resources/drawable-xxhdpi/id.png
--- a/src/Android/Resources/drawable-xxhdpi/lock.png
+++ b/src/Android/Resources/drawable-xxhdpi/lock.png
--- a/src/Android/Resources/drawable-xxhdpi/login.png
+++ b/src/Android/Resources/drawable-xxhdpi/login.png
--- a/src/Android/Resources/drawable-xxhdpi/logo_legacy.png
+++ b/src/Android/Resources/drawable-xxhdpi/logo_legacy.png
--- a/src/Android/Resources/drawable-xxhdpi/logo_white_legacy.png
+++ b/src/Android/Resources/drawable-xxhdpi/logo_white_legacy.png
--- a/src/Android/Resources/drawable-xxhdpi/pencil.png
+++ b/src/Android/Resources/drawable-xxhdpi/pencil.png
--- a/src/Android/Resources/drawable-xxhdpi/plus.png
+++ b/src/Android/Resources/drawable-xxhdpi/plus.png
--- a/src/Android/Resources/drawable-xxhdpi/refresh.png
+++ b/src/Android/Resources/drawable-xxhdpi/refresh.png
--- a/src/Android/Resources/drawable-xxhdpi/refresh_sm.png
+++ b/src/Android/Resources/drawable-xxhdpi/refresh_sm.png
--- a/src/Android/Resources/drawable-xxhdpi/search.png
+++ b/src/Android/Resources/drawable-xxhdpi/search.png
--- a/src/Android/Resources/drawable-xxhdpi/shield.png
+++ b/src/Android/Resources/drawable-xxhdpi/shield.png
--- a/src/Android/Resources/drawable-xxxhdpi/card.png
+++ b/src/Android/Resources/drawable-xxxhdpi/card.png
--- a/src/Android/Resources/drawable-xxxhdpi/cog.png
+++ b/src/Android/Resources/drawable-xxxhdpi/cog.png
--- a/src/Android/Resources/drawable-xxxhdpi/id.png
+++ b/src/Android/Resources/drawable-xxxhdpi/id.png
--- a/src/Android/Resources/drawable-xxxhdpi/lock.png
+++ b/src/Android/Resources/drawable-xxxhdpi/lock.png
--- a/src/Android/Resources/drawable-xxxhdpi/login.png
+++ b/src/Android/Resources/drawable-xxxhdpi/login.png
--- a/src/Android/Resources/drawable-xxxhdpi/pencil.png
+++ b/src/Android/Resources/drawable-xxxhdpi/pencil.png
--- a/src/Android/Resources/drawable-xxxhdpi/plus.png
+++ b/src/Android/Resources/drawable-xxxhdpi/plus.png
--- a/src/Android/Resources/drawable-xxxhdpi/refresh.png
+++ b/src/Android/Resources/drawable-xxxhdpi/refresh.png
--- a/src/Android/Resources/drawable-xxxhdpi/refresh_sm.png
+++ b/src/Android/Resources/drawable-xxxhdpi/refresh_sm.png
--- a/src/Android/Resources/drawable-xxxhdpi/search.png
+++ b/src/Android/Resources/drawable-xxxhdpi/search.png
--- a/src/Android/Resources/drawable-xxxhdpi/shield.png
+++ b/src/Android/Resources/drawable-xxxhdpi/shield.png
--- a/src/Android/Resources/drawable/accessibility_overlay.png
+++ b/src/Android/Resources/drawable/accessibility_overlay.png
--- a/Show More
+++ b/Show More